diff --git a/README.md b/README.md
index 0a1d5f69..d0f46849 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,8 @@ information on what to include when reporting a bug.
 
  - [Win32] Bugfix: A window created maximized and undecorated would cover the whole
    monitor (#1806)
+ - [Win32] Bugfix: The default restored window position was lost when creating a maximized
+   window
  - [Cocoa] Bugfix: `kUTTypeURL` was deprecated in macOS 12.0 (#2003)
  - [X11] Bugfix: Dynamic loading on OpenBSD failed due to soname differences
  - [X11] Bugfix: Waiting for events would fail if file descriptor was too large
diff --git a/src/win32_window.c b/src/win32_window.c
index da6ac717..a68b3c8b 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -1309,9 +1309,6 @@ static int createNativeWindow(_GLFWwindow* window,
             }
         }
 
-        ClientToScreen(window->win32.handle, (POINT*) &rect.left);
-        ClientToScreen(window->win32.handle, (POINT*) &rect.right);
-
         if (_glfwIsWindows10AnniversaryUpdateOrGreaterWin32())
         {
             AdjustWindowRectExForDpi(&rect, style, FALSE, exStyle,
@@ -1321,6 +1318,10 @@ static int createNativeWindow(_GLFWwindow* window,
             AdjustWindowRectEx(&rect, style, FALSE, exStyle);
 
         GetWindowPlacement(window->win32.handle, &wp);
+        OffsetRect(&rect,
+                   wp.rcNormalPosition.left - rect.left,
+                   wp.rcNormalPosition.top - rect.top);
+
         wp.rcNormalPosition = rect;
         wp.showCmd = SW_HIDE;
         SetWindowPlacement(window->win32.handle, &wp);