diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index db7565827..6269482c2 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2244,10 +2244,14 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
         }
         else
         {
+            if (!window->resizable)
+                updateNormalHints(window, width, height);
+
             XMoveResizeWindow(_glfw.x11.display, window->x11.handle,
                               xpos, ypos, width, height);
         }
 
+        XFlush(_glfw.x11.display);
         return;
     }