diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp
index 2d240287a..cc671ca60 100644
--- a/Source/Glide64/Config.cpp
+++ b/Source/Glide64/Config.cpp
@@ -1116,13 +1116,14 @@ void CALL DllConfig ( HWND hParent )
     hostWindow = new wxWindow();
   WXHWND hwnd = hParent;
   hostWindow->SetHWND(hwnd);
-  hostWindow->SubclassWin(hwnd);
+//  hostWindow->SubclassWin(hwnd);
   hostWindow->Disable();
 #endif
 
   Glide64ConfigDialog* Glide64Config = new Glide64ConfigDialog(hostWindow, wxID_ANY, wxEmptyString);
   Glide64Config->ShowModal();
   delete hostWindow;
+  hostWindow = NULL;
 }
 
 /*#ifndef _DEBUG
@@ -1149,7 +1150,7 @@ void CloseConfig()
   }
 #ifdef __WINDOWS__
   hostWindow->Enable();
-  hostWindow->UnsubclassWin();
+//  hostWindow->UnsubclassWin();
   hostWindow->SetHWND(NULL);
 #endif
   mutexProcessDList->Unlock();
@@ -1306,5 +1307,6 @@ void CALL DllAbout ( HWND hParent )
   //  hostWindow->UnsubclassWin();
   hostWindow->SetHWND(NULL);
   delete hostWindow;
+  hostWindow = NULL;
 #endif
 }