1 files changed, 1 insertions, 0 deletions

diff --git a/src/Window.cc b/src/Window.cc
index d761016..342e488 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -353,6 +353,7 @@ FluxboxWindow::~FluxboxWindow() {
     // no longer a valid window to do stuff with
     Fluxbox::instance()->removeWindowSearchGroup(frame().window().window());
     Fluxbox::instance()->removeWindowSearchGroup(frame().tabcontainer().window());
+    Fluxbox::instance()->shortcutManager().removeWindow(this);
 
     Client2ButtonMap::iterator it = m_labelbuttons.begin();
     Client2ButtonMap::iterator it_end = m_labelbuttons.end();