1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 5d5e6687a..9ad902936 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -95,8 +95,8 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
 {
     static WId id = 1;
     mWindowId = id++;
-
-    initWindow();
+    if (window->type() != Qt::Desktop)
+        initWindow();
 }
 
 QWaylandWindow::~QWaylandWindow()
@@ -129,7 +129,8 @@ void QWaylandWindow::initWindow()
         if (::wl_subsurface *ss = mDisplay->createSubSurface(this, p)) {
             mSubSurfaceWindow = new QWaylandSubSurface(this, p, ss);
         }
-    } else if (!(window()->flags() & Qt::BypassWindowManagerHint)) {
+    } else if (!(qEnvironmentVariableIsSet("QT_WAYLAND_USE_BYPASSWINDOWMANAGERHINT") &&
+               window()->flags() & Qt::BypassWindowManagerHint)) {
         mShellSurface = mDisplay->createShellSurface(this);
     }