diff --git a/src/main.c b/src/main.c
index 39150e9..9540b8a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -465,6 +465,7 @@ void ToggleFullscreen()
             }
 
             ddraw->windowed = TRUE;
+            ddraw->windowed_init = TRUE;
         }
     }
 }
@@ -477,7 +478,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     {
         case WM_MOVE:
         {
-            if (ddraw->windowed)
+            if (ddraw->windowed && ddraw->windowed_init)
             {
                 int x = (int)(short)LOWORD(lParam);
                 int y = (int)(short)HIWORD(lParam);