diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index 28c6da2ca..fa3a5b609 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2253,16 +2253,20 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
 
     _glfwInputWindowMonitor(window, monitor);
     updateNormalHints(window, width, height);
-    updateWindowMode(window);
 
     if (window->monitor)
     {
-        XMapRaised(_glfw.x11.display, window->x11.handle);
-        if (waitForVisibilityNotify(window))
-            acquireMonitor(window);
+       if (!_glfwPlatformWindowVisible(window))
+       {
+           XMapRaised(_glfw.x11.display, window->x11.handle);
+           waitForVisibilityNotify(window);
+       }
+       updateWindowMode(window);
+       acquireMonitor(window);
     }
     else
     {
+        updateWindowMode(window);
         XMoveResizeWindow(_glfw.x11.display, window->x11.handle,
                           xpos, ypos, width, height);
     }