diff --git a/src/kits/interface/MenuBar.cpp b/src/kits/interface/MenuBar.cpp
index f1171fa59f..6661082f7c 100644
--- a/src/kits/interface/MenuBar.cpp
+++ b/src/kits/interface/MenuBar.cpp
@@ -413,7 +413,7 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
 
 		window->Unlock();
 
-		if (localAction == MENU_ACT_CLOSE)
+		if (localAction == MENU_ACT_CLOSE || buttons == 0)
 			break;
 
 		if (snoozeAmount > 0)