diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 9f00b519b0..6eae8ddf54 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -60930,6 +60930,7 @@ void MenuBarComponent::showMenu (int index)
 
         indexToShowAgain = -1;
         currentPopupIndex = -1;
+        itemUnderMouse = index;
         deleteAndZero (currentPopup);
         menuBarItemsChanged (0);
 
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 191632981b..7b4c547d8a 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -43195,6 +43195,7 @@ private:
     void hideCurrentMenu();
     void timerCallback();
     void repaintMenuItem (int index);
+    void showMenuInternal (const int menuIndex);
 
     MenuBarComponent (const MenuBarComponent&);
     const MenuBarComponent& operator= (const MenuBarComponent&);
diff --git a/src/juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp b/src/juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp
index 05e4a67395..0e67390a0d 100644
--- a/src/juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp
+++ b/src/juce_appframework/gui/components/menus/juce_MenuBarComponent.cpp
@@ -196,6 +196,7 @@ void MenuBarComponent::showMenu (int index)
 
         indexToShowAgain = -1;
         currentPopupIndex = -1;
+        itemUnderMouse = index;
         deleteAndZero (currentPopup);
         menuBarItemsChanged (0);