diff --git a/idd/LGIddHelper/CWindow.cpp b/idd/LGIddHelper/CWindow.cpp
index af5f668e..ee9d1772 100644
--- a/idd/LGIddHelper/CWindow.cpp
+++ b/idd/LGIddHelper/CWindow.cpp
@@ -43,6 +43,10 @@ LRESULT CWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
   {
   case WM_CREATE:
     return onCreate();
+  case WM_CLOSE:
+    return onClose();
+  case WM_DESTROY:
+    return onDestroy();
   default:
     return DefWindowProc(m_hwnd, uMsg, wParam, lParam);
   }
@@ -53,6 +57,16 @@ LRESULT CWindow::onCreate()
   return 0;
 }
 
+LRESULT CWindow::onClose()
+{
+  return DefWindowProc(m_hwnd, WM_CLOSE, 0, 0);
+}
+
+LRESULT CWindow::onDestroy()
+{
+  return 0;
+}
+
 void CWindow::destroy()
 {
   if (m_hwnd)
diff --git a/idd/LGIddHelper/CWindow.h b/idd/LGIddHelper/CWindow.h
index 594ebd8e..074c9e30 100644
--- a/idd/LGIddHelper/CWindow.h
+++ b/idd/LGIddHelper/CWindow.h
@@ -8,6 +8,8 @@ class CWindow {
   static LRESULT CALLBACK wndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
   virtual LRESULT onCreate();
+  virtual LRESULT onClose();
+  virtual LRESULT onDestroy();
 
 protected:
   static HINSTANCE hInstance;