diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index fb9eca8c9a7..e98eb823c87 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -627,6 +627,9 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
         break;
     case WM_SIZE:
         return Help_OnSize(hWnd);
+    case WM_CLOSE:
+        ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+        return 0;
     case WM_DESTROY:
         PostQuitMessage(0);
         break;
@@ -780,6 +783,9 @@ void ReleaseHelpViewer(HHInfo *info)
 
     ReleaseWebBrowser(info);
 
+    if(info->WinType.hwndHelp)
+        DestroyWindow(info->WinType.hwndHelp);
+
     hhctrl_free(info);
     OleUninitialize();
 }
diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index b8c4f45aa28..031c997feb9 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -159,8 +159,6 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine)
         DispatchMessageW(&msg);
     }
 
-    ReleaseHelpViewer(info);
-
     return 0;
 }