1 files changed, 4 insertions, 1 deletions

diff --git a/src/Window.cc b/src/Window.cc
index dbd945f..133ccd2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -295,8 +295,11 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
 FluxboxWindow::~FluxboxWindow() {
     if (WindowCmd<void>::window() == this)
         WindowCmd<void>::setWindow(0);
+    if ( Fluxbox::instance()->keys() != 0 ) {
+        Fluxbox::instance()->keys()->
+            unregisterWindow(frame().window().window());
+    }
 
-    Fluxbox::instance()->keys()->unregisterWindow(frame().window().window());
 
 #ifdef DEBUG
     const char* title = m_client ? m_client->title().c_str() : "" ;