diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 31fa46d7647..1a6e256cd27 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -83,9 +83,6 @@ StartupWindowThread(LPVOID lpParam)
 		(LPARAM)lpParam);
 	SetThreadDesktop(OldDesk);
 
-	msg->Context->hStatusWindow = 0;
-	msg->Context->SignaledStatusWindowCreated = FALSE;
-
 	HeapFree(GetProcessHeap(), 0, lpParam);
 	return TRUE;
 }
@@ -159,6 +156,7 @@ GUIRemoveStatusMessage(
 	{
 		EndDialog(pgContext->hStatusWindow, 0);
 		pgContext->hStatusWindow = 0;
+		pgContext->SignaledStatusWindowCreated = FALSE;
 	}
 
 	return TRUE;