Index: cpl/appwiz/addons.c
===================================================================
--- cpl/appwiz/addons.c	(revision 65099)
+++ cpl/appwiz/addons.c	(working copy)
@@ -397,7 +397,7 @@
     return FALSE;
 }
 
-BOOL install_addon(addon_t addon_type)
+BOOL install_addon(addon_t addon_type, HWND hwnd_parent)
 {
 
     if(!*ARCH_STRING)
@@ -411,7 +411,7 @@
      * - download the package
      */
     if (install_from_registered_dir() == INSTALL_NEXT)
-        DialogBoxW(hApplet, addon->dialog_template, 0, installer_proc);
+        DialogBoxW(hApplet, addon->dialog_template, hwnd_parent, installer_proc);
 
     return TRUE;
 }
Index: cpl/appwiz/appwiz.c
===================================================================
--- cpl/appwiz/appwiz.c	(revision 65099)
+++ cpl/appwiz/appwiz.c	(working copy)
@@ -14,7 +14,7 @@
 
 HINSTANCE hApplet = NULL;
 
-static LONG start_params(const WCHAR *params)
+static LONG start_params(const WCHAR *params, HWND hwnd_parent)
 {
     static const WCHAR install_geckoW[] = {'i','n','s','t','a','l','l','_','g','e','c','k','o',0};
     static const WCHAR install_monoW[] = {'i','n','s','t','a','l','l','_','m','o','n','o',0};
@@ -23,12 +23,12 @@
         return FALSE;
 
     if(!strcmpW(params, install_geckoW)) {
-        install_addon(ADDON_GECKO);
+        install_addon(ADDON_GECKO, hwnd_parent);
         return TRUE;
     }
 
     if(!strcmpW(params, install_monoW)) {
-        install_addon(ADDON_MONO);
+        install_addon(ADDON_MONO, hwnd_parent);
         return TRUE;
     }
 
@@ -51,7 +51,7 @@
             return 1;
 
         case CPL_STARTWPARMSW:
-            return start_params((const WCHAR *)lParam2);
+            return start_params((const WCHAR *)lParam2, hwndCPl);
 
         case CPL_INQUIRE:
             CPlInfo = (CPLINFO*)lParam2;
Index: cpl/appwiz/appwiz.h
===================================================================
--- cpl/appwiz/appwiz.h	(revision 65099)
+++ cpl/appwiz/appwiz.h	(working copy)
@@ -50,7 +50,7 @@
     ADDON_MONO
 } addon_t;
 
-BOOL install_addon(addon_t) DECLSPEC_HIDDEN;
+BOOL install_addon(addon_t, HWND hwnd_parent) DECLSPEC_HIDDEN;
 
 extern HINSTANCE hInst DECLSPEC_HIDDEN;
 
Index: win32/syssetup/wizard.c
===================================================================
--- win32/syssetup/wizard.c	(revision 65099)
+++ win32/syssetup/wizard.c	(working copy)
@@ -1984,7 +1984,7 @@
             PSETUPDATA SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
 
             /* Run the Wine Gecko prompt */
-            Control_RunDLLW(GetDesktopWindow(), 0, L"appwiz.cpl install_gecko", SW_SHOW);
+            Control_RunDLLW(hwndDlg, 0, L"appwiz.cpl install_gecko", SW_SHOW);
 
             /* Set title font */
             SendDlgItemMessage(hwndDlg,