1 files changed, 4 insertions, 2 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 5f45ce8..a8613c3 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2260,13 +2260,15 @@ void FluxboxWindow::showMenu(int menu_x, int menu_y) {
    if it's already visible it'll be hidden
  */
 void FluxboxWindow::popupMenu() {
-    WindowCmd<void>::setWindow(this);
 
-    if (menu().isVisible()) {
+    // hide menu if it was opened for this window before
+    if (menu().isVisible() && WindowCmd<void>::window() == this) {
         menu().hide();
         return;
     }
 
+    WindowCmd<void>::setWindow(this);
+
     menu().disableTitle();
     int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth();
     if (!decorations.titlebar) // if we don't have any titlebar