Index: dll/win32/syssetup/wizard.c
===================================================================
--- dll/win32/syssetup/wizard.c	(revision 58022)
+++ dll/win32/syssetup/wizard.c	(working copy)
@@ -192,12 +192,36 @@
 
         case WM_CLOSE:
             EndDialog(hwndDlg, IDCANCEL);
+            WCHAR szWndTitle[64];
+
+            if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, szWndTitle, sizeof(szWndTitle) / sizeof(szWndTitle[0])))
+            {
+                wcscpy(szWndTitle, L"ReactOS Setup");
+            }
+
+            HWND hSetupWnd = FindWindow(0, szWndTitle);
+            if (NULL != hSetupWnd)
+            {
+                SetForegroundWindow(hSetupWnd);
+            }
             break;
 
         case WM_COMMAND:
             if (HIWORD(wParam) == BN_CLICKED && IDOK == LOWORD(wParam))
             {
                 EndDialog(hwndDlg, IDOK);
+                WCHAR szWndTitle[64];
+
+                if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, szWndTitle, sizeof(szWndTitle) / sizeof(szWndTitle[0])))
+                {
+                    wcscpy(szWndTitle, L"ReactOS Setup");
+                }
+
+                HWND hSetupWnd = FindWindow(0, szWndTitle);
+                if (NULL != hSetupWnd)
+                {
+                    SetForegroundWindow(hSetupWnd);
+                }
             }
             break;