diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index fb9eca8..e98eb82 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -627,6 +627,9 @@
         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 @@
 
     ReleaseWebBrowser(info);
 
+    if(info->WinType.hwndHelp)
+        DestroyWindow(info->WinType.hwndHelp);
+
     hhctrl_free(info);
     OleUninitialize();
 }