diff --git a/README.md b/README.md
index 6a10ae5c..d4a60417 100644
--- a/README.md
+++ b/README.md
@@ -357,6 +357,8 @@ information on what to include when reporting a bug.
    scale changed
  - [Wayland] Bugfix: `glfwSetWindowAspectRatio` reported an error instead of
    applying the specified ratio
+ - [Wayland] Bugfix: `GLFW_MAXIMIZED` window hint had no effect
+ - [Wayland] Bugfix: `glfwRestoreWindow` had no effect before first show
  - [POSIX] Removed use of deprecated function `gettimeofday`
  - [POSIX] Bugfix: `CLOCK_MONOTONIC` was not correctly tested for or enabled
  - [WGL] Disabled the DWM swap interval hack for Windows 8 and later (#1072)
diff --git a/src/wl_window.c b/src/wl_window.c
index e25c1048..efad74d9 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -702,6 +702,8 @@ static GLFWbool createNativeSurface(_GLFWwindow* window,
     window->wl.scale = 1;
     window->wl.title = _glfw_strdup(wndconfig->title);
 
+    window->wl.maximized = wndconfig->maximized;
+
     window->wl.transparent = fbconfig->transparent;
     if (!window->wl.transparent)
         setOpaqueRegion(window);
@@ -2003,10 +2005,12 @@ void _glfwRestoreWindowWayland(_GLFWwindow* window)
     {
         // We assume we are not minimized and acto only on maximization
 
-        if (window->wl.xdg.toplevel)
+        if (window->wl.maximized)
         {
-            if (window->wl.maximized)
+            if (window->wl.xdg.toplevel)
                 xdg_toplevel_unset_maximized(window->wl.xdg.toplevel);
+            else
+                window->wl.maximized = GLFW_FALSE;
         }
     }
 }
@@ -2015,6 +2019,8 @@ void _glfwMaximizeWindowWayland(_GLFWwindow* window)
 {
     if (window->wl.xdg.toplevel)
         xdg_toplevel_set_maximized(window->wl.xdg.toplevel);
+    else
+        window->wl.maximized = GLFW_TRUE;
 }
 
 void _glfwShowWindowWayland(_GLFWwindow* window)