diff --git a/glfw/window.c b/glfw/window.c
index 4ce6edda1..d79de22d0 100644
--- a/glfw/window.c
+++ b/glfw/window.c
@@ -277,8 +277,10 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
         if (wndconfig.visible)
         {
             _glfwPlatformShowWindow(window);
+#ifndef _GLFW_WAYLAND
             if (wndconfig.focused)
                 _glfwPlatformFocusWindow(window);
+#endif
         }
     }
 
@@ -813,8 +815,10 @@ GLFWAPI void glfwShowWindow(GLFWwindow* handle)
 
     _glfwPlatformShowWindow(window);
 
+#ifndef _GLFW_WAYLAND
     if (window->focusOnShow)
         _glfwPlatformFocusWindow(window);
+#endif
 }
 
 GLFWAPI void glfwRequestWindowAttention(GLFWwindow* handle)