diff --git a/README.md b/README.md
index b50afcd6..d51894ad 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,7 @@ information on what to include when reporting a bug.
    inconsistent state
  - [Wayland] Bugfix: Window maximization events were not emitted
  - [Wayland] Bugfix: `glfwRestoreWindow` assumed it was always in windowed mode
+ - [Wayland] Bugfix: `glfwSetWindowSize` would resize a full screen window
 
 
 ## Contact
diff --git a/src/wl_window.c b/src/wl_window.c
index da63170d..c8a69291 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -548,7 +548,9 @@ static void xdgToplevelHandleConfigure(void* userData,
         }
 
         _glfwInputWindowSize(window, width, height);
-        _glfwPlatformSetWindowSize(window, width, height);
+        window->wl.width = width;
+        window->wl.height = height;
+        resizeWindow(window);
         _glfwInputWindowDamage(window);
     }
 
@@ -1903,9 +1905,16 @@ void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
 
 void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
 {
-    window->wl.width = width;
-    window->wl.height = height;
-    resizeWindow(window);
+    if (window->monitor)
+    {
+        // Video mode setting is not available on Wayland
+    }
+    else
+    {
+        window->wl.width = width;
+        window->wl.height = height;
+        resizeWindow(window);
+    }
 }
 
 void _glfwPlatformSetWindowSizeLimits(_GLFWwindow* window,