diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 7a5f3cb6f9..3f05606e8d 100644
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -79,7 +79,7 @@ static bool LoadHtmlHelpLibrary()
 static void UnloadHtmlHelpLibrary()
 {
     if ( gs_htmlHelp )
-    {
+    {		
         if (wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") ))
             gs_htmlHelp = 0;
     }
@@ -243,6 +243,7 @@ wxString wxCHMHelpController::GetValidFilename(const wxString& file) const
 
 wxCHMHelpController::~wxCHMHelpController()
 {
+	gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);
     UnloadHtmlHelpLibrary();
 }