diff --git a/windlg.c b/windlg.c
index 1e5a6322..793bb08c 100644
--- a/windlg.c
+++ b/windlg.c
@@ -2426,8 +2426,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
     }
     if (msg == WM_COMMAND && LOWORD(wParam) == IDCX_ABOUT) {
 	EnableWindow(hwnd, 0);
-	DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
-		  GetParent(hwnd), AboutProc);
+	DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd, AboutProc);
 	EnableWindow(hwnd, 1);
 	SetActiveWindow(hwnd);
     }
@@ -2452,6 +2451,7 @@ void defuse_showwindow(void)
 	hwnd = CreateDialog(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
 			    NULL, NullDlgProc);
 	ShowWindow(hwnd, SW_HIDE);
+	SetActiveWindow(hwnd);
 	DestroyWindow(hwnd);
     }
 }
diff --git a/window.c b/window.c
index 9948763e..546a9172 100644
--- a/window.c
+++ b/window.c
@@ -574,6 +574,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * Finally show the window!
      */
     ShowWindow(hwnd, show);
+    SetForegroundWindow(hwnd);
 
     /*
      * Open the initial log file if there is one.