1 files changed, 2 insertions, 0 deletions

diff --git a/src/Window.cc b/src/Window.cc
index e56f735..56c6f95 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -326,6 +326,8 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbTk::XLayer &layer):
 FluxboxWindow::~FluxboxWindow() {
     if (WindowCmd<void>::window() == this)
         WindowCmd<void>::setWindow(0);
+    if (FbMenu::window() == this)
+        FbMenu::setWindow(0);
     if ( Fluxbox::instance()->keys() != 0 ) {
         Fluxbox::instance()->keys()->
             unregisterWindow(frame().window().window());