diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index e67ea205a6..3db7251a4b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -3015,6 +3015,8 @@ BWindow::_HandleKeyDown(char key, uint32 modifiers)
 			return true;
 		}
 
+		MenusBeginning();
+
 		Shortcut* shortcut = _FindShortcut(key, modifiers);
 		if (shortcut != NULL) {
 			// TODO: would be nice to move this functionality to
@@ -3043,9 +3045,10 @@ BWindow::_HandleKeyDown(char key, uint32 modifiers)
 					PostMessage(&message, target);
 				}
 			}
-
 		}
 
+		MenusEnded();
+
 		// we always eat the event if the command key was pressed
 		return true;
 	}