diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp
index b8085596d6..863756d7ae 100755
--- a/client/win/wingui_mainwindow.cpp
+++ b/client/win/wingui_mainwindow.cpp
@@ -84,6 +84,13 @@ BOOL CMyApp::InitInstance()
     return TRUE;
 }
 
+int CMyApp::ExitInstance()
+{
+	m_pMainWnd->DestroyWindow();
+
+	return 0;
+}
+
 /////////////////////////////////////////////////////////////////////////
 // CMainWindow message map and member functions
 
@@ -1280,7 +1287,7 @@ void CMainWindow::OnCommandExit()
 	// quit
 	gstate.cleanup_and_exit();
 	PostQuitMessage(0);
-	KillTimer(ID_TIMER);
+	KillTimer(m_nTimerID);
 
 	// status icon in taskbar
 	SetStatusIcon(ICON_OFF);
diff --git a/client/win/wingui_mainwindow.h b/client/win/wingui_mainwindow.h
index 85871d178d..d1723848d0 100755
--- a/client/win/wingui_mainwindow.h
+++ b/client/win/wingui_mainwindow.h
@@ -77,6 +77,7 @@ class CMyApp : public CWinApp
 {
 public:
     virtual BOOL			InitInstance();
+    virtual int				ExitInstance();
 };
 
 //////////