diff --git a/README.md b/README.md
index 6366a4f3..2c0436ce 100644
--- a/README.md
+++ b/README.md
@@ -245,6 +245,8 @@ information on what to include when reporting a bug.
 - [X11] Bugfix: NVidia EGL would segfault if unloaded before closing the display
 - [X11] Bugfix: Checking window maximized attrib could crash some WMs (#1356)
 - [X11] Bugfix: Update cursor position on enter event (#1366)
+- [X11] Bugfix: `glfwSetWindowMonitor` did not update hints when resizing
+                non-user-resizable windows
 - [Linux] Added workaround for missing `SYN_DROPPED` in pre-2.6.39 kernel
           headers (#1196)
 - [Linux] Moved to evdev for joystick input (#906,#1005)
diff --git a/src/x11_window.c b/src/x11_window.c
index 5e916107..e9efcb1f 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -2403,6 +2403,9 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
         }
         else
         {
+            if (!window->resizable)
+                updateNormalHints(window, width, height);
+
             XMoveResizeWindow(_glfw.x11.display, window->x11.handle,
                               xpos, ypos, width, height);
         }