diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c
index 915db070985..cdca2dd604d 100644
--- a/dlls/comctl32/theme_dialog.c
+++ b/dlls/comctl32/theme_dialog.c
@@ -54,7 +54,9 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg,
     
     case WM_DESTROY:
         CloseThemeData ( theme );
-	return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam);
+        SetWindowTheme( hWnd, NULL, NULL );
+        OpenThemeData( hWnd, NULL );
+        return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam);
 
     case WM_THEMECHANGED:
         CloseThemeData ( theme );