diff --git a/wayland_adapter/framework/core/wayland_surface.cpp b/wayland_adapter/framework/core/wayland_surface.cpp
index 60843531c22eda18c848d9968c921f678c98008c..2bc67f40cfed4079918583648c7d9eaf710ff495 100644
--- a/wayland_adapter/framework/core/wayland_surface.cpp
+++ b/wayland_adapter/framework/core/wayland_surface.cpp
@@ -397,7 +397,7 @@ void WaylandSurface::Commit()
         return; // it is pointer surface, we do not handle commit!
     }
 
-    if (window_ == nullptr) {
+    if (withTopLevel_ && window_ == nullptr) {
         CreateWindow();
     }