diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index c5f6ecdd13..9a074cc411 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1563,9 +1563,20 @@ BMenu::_Track(int* action, long start)
 		fSuper->fState = MENU_STATE_TRACKING_SUBMENU;
 
 	BPoint location;
+	BPoint screenLocation;
 	uint32 buttons = 0;
+	bool openedUnderMouse = false;
 	if (LockLooper()) {
 		GetMouse(&location, &buttons);
+
+		// If the menu has opened underneath the mouse we will not invoke or return
+		// the selected item unless the mouse is moved. This only applies if there
+		// is no parent menu.
+		if (fSuper == NULL) {
+			screenLocation = ConvertToScreen(location);
+			openedUnderMouse = Window()->Frame().Contains(screenLocation);
+		}
+
 		UnlockLooper();
 	}
 
@@ -1578,7 +1589,7 @@ BMenu::_Track(int* action, long start)
 			break;
 
 		BMenuWindow* window = static_cast<BMenuWindow*>(Window());
-		BPoint screenLocation = ConvertToScreen(location);
+		screenLocation = ConvertToScreen(location);
 		if (window->CheckForScrolling(screenLocation)) {
 			UnlockLooper();
 			continue;
@@ -1590,7 +1601,8 @@ BMenu::_Track(int* action, long start)
 		// then if the menu is inside this menu,
 		// then if it's over a super menu.
 		bool overSub = _OverSubmenu(fSelected, screenLocation);
-		item = _HitTestItems(location, B_ORIGIN);
+		if (!openedUnderMouse)
+			item = _HitTestItems(location, B_ORIGIN);
 		if (overSub) {
 			navAreaRectAbove = BRect();
 			navAreaRectBelow = BRect();
@@ -1670,6 +1682,7 @@ BMenu::_Track(int* action, long start)
 					releasedOnce = true;
 				location = newLocation;
 				buttons = newButtons;
+				openedUnderMouse = false;
 			}
 
 			if (releasedOnce)