diff --git a/README.md b/README.md
index d2fbceaa..51911f98 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,8 @@ information on what to include when reporting a bug.
                   hint set to false (#1179,#1180)
 - [Win32] Bugfix: The keypad equals key was reported as `GLFW_KEY_UNKNOWN`
                   (#1315,#1316)
+- [Win32] Bugfix: A title bar would be drawn over undecorated windows in some
+                  circumstances (#1383)
 - [X11] Moved to XI2 `XI_RawMotion` for disable cursor mode motion input (#125)
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
 - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X
diff --git a/src/win32_window.c b/src/win32_window.c
index daef1536..a0abca06 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -1060,6 +1060,17 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
             return TRUE;
         }
 
+        case WM_NCACTIVATE:
+        case WM_NCPAINT:
+        {
+            // Prevent title bar from being drawn after restoring a minimized
+            // undecorated window
+            if (!window->decorated)
+                return TRUE;
+
+            break;
+        }
+
         case WM_DWMCOMPOSITIONCHANGED:
         {
             if (window->win32.transparent)
@@ -1161,19 +1172,6 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
             DragFinish(drop);
             return 0;
         }
-
-        case WM_NCACTIVATE:
-        case WM_NCPAINT:
-        {
-            // HACK: Prevent title bar artifacts from appearing after restoring
-            //       a minimized borderless window
-            if (!window->decorated)
-            {
-                return TRUE;
-            }
-
-            break;
-        }
     }
 
     return DefWindowProcW(hWnd, uMsg, wParam, lParam);