diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c
index 90702b41c00..9e309ac7dcd 100644
--- a/reactos/subsystems/win32/win32k/ntuser/focus.c
+++ b/reactos/subsystems/win32/win32k/ntuser/focus.c
@@ -227,6 +227,7 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin
    if (PrevForegroundQueue != 0)
    {
       hWndPrev = PrevForegroundQueue->ActiveWindow;
+      hWndFocusPrev = PrevForegroundQueue->FocusWindow;
    }
 
    if (hWndPrev == hWnd)
@@ -235,9 +236,6 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin
       return TRUE;
    }
 
-   hWndFocusPrev = (PrevForegroundQueue == FocusWindow->pti->MessageQueue
-                    ? FocusWindow->pti->MessageQueue->FocusWindow : NULL);
-
    /* FIXME: Call hooks. */
 
    co_IntSendDeactivateMessages(hWndPrev, hWnd);