diff --git a/README.md b/README.md
index f4ef3791..cc3e3ccc 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,8 @@ information on what to include when reporting a bug.
    and later (#2018)
  - [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] Added support for `VK_EXT_metal_surface` (#1619)
  - [Cocoa] Added locating the Vulkan loader at runtime in an application bundle
  - [Cocoa] Moved main menu creation to GLFW initialization time (#1649)
diff --git a/src/win32_window.c b/src/win32_window.c
index c8f7782e..0f76cf56 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -1316,9 +1316,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,
@@ -1328,6 +1325,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);