diff --git a/src/wl_window.c b/src/wl_window.c
index d131534e..072b3ba7 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -749,12 +749,6 @@ static GLFWbool createNativeSurface(_GLFWwindow* window,
     if (!window->wl.transparent)
         setContentAreaOpaque(window);
 
-    if (window->monitor || wndconfig->visible)
-    {
-        if (!createShellObjects(window))
-            return GLFW_FALSE;
-    }
-
     return GLFW_TRUE;
 }
 
@@ -1839,6 +1833,12 @@ GLFWbool _glfwCreateWindowWayland(_GLFWwindow* window,
     if (wndconfig->mousePassthrough)
         _glfwSetWindowMousePassthroughWayland(window, GLFW_TRUE);
 
+    if (window->monitor || wndconfig->visible)
+    {
+        if (!createShellObjects(window))
+            return GLFW_FALSE;
+    }
+
     return GLFW_TRUE;
 }