diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index b83ae48..0e5799f 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -3482,6 +3482,9 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package,
 
     TRACE("%p %s\n", package, debugstr_w(szDialogName));
 
+    if (!hMsiHiddenWindow)
+        msi_dialog_register_class();
+
     /* allocate the structure for the dialog to use */
     dialog = msi_alloc_zero( sizeof *dialog + sizeof(WCHAR)*strlenW(szDialogName) );
     if( !dialog )
diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c
index 2c32b3b..25fb18b 100644
--- a/dlls/msi/msi_main.c
+++ b/dlls/msi/msi_main.c
@@ -72,7 +72,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     case DLL_PROCESS_ATTACH:
         msi_hInstance = hinstDLL;
         DisableThreadLibraryCalls(hinstDLL);
-        msi_dialog_register_class();
         break;
     case DLL_PROCESS_DETACH:
         if (msi_typelib) ITypeLib_Release( msi_typelib );
-- 
1.5.4.3