Index: reactos/win32ss/user/ntuser/window.c
===================================================================
--- reactos/win32ss/user/ntuser/window.c	(revision 75484)
+++ reactos/win32ss/user/ntuser/window.c	(working copy)
@@ -582,6 +582,9 @@
 
       if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellListView)
          ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL;
+
+      if (ThreadData->rpdesk->spwndTrack == Window)
+         ThreadData->rpdesk->spwndTrack = NULL;
    }
 
    /* Fixes dialog test_focus breakage due to r66237. */