diff --git a/ChangeLog b/ChangeLog
index da33f823..ab151a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.1.2
 *09/06/28:
+   * Hide the menu when you click on a window (Mark)
+     Window.cc
    * Make Raise/LowerLayer commands accept integer argument, defualt 2 (Mark)
      CurrentWindowCmd.cc/hh Window.cc/hh
    * Change default toolbar head to 1 (Mark)
diff --git a/src/Window.cc b/src/Window.cc
index defa6cca..d38fb8a8 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2403,10 +2403,9 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
         } else if (frame().handle() == be.window)
             raise();
 
+        FbTk::Menu::hideShownMenu();
         if (!m_focused && acceptsFocus() && m_click_focus) //check focus
             focus();
-
-        menu().hide();
     }
 }