diff --git a/src/juce_appframework/gui/components/juce_Component.cpp b/src/juce_appframework/gui/components/juce_Component.cpp
index 4a19ef83a7..ad586e3597 100644
--- a/src/juce_appframework/gui/components/juce_Component.cpp
+++ b/src/juce_appframework/gui/components/juce_Component.cpp
@@ -3079,7 +3079,7 @@ void Component::internalBroughtToFront()
 
         if (cm != 0 && cm->getTopLevelComponent() != getTopLevelComponent())
         {
-            cm->getTopLevelComponent()->toFront (false);
+            cm->getTopLevelComponent()->toFront (true);
         }
     }
 }
diff --git a/src/juce_appframework/gui/components/menus/juce_PopupMenu.cpp b/src/juce_appframework/gui/components/menus/juce_PopupMenu.cpp
index 026a462321..8dd2d64855 100644
--- a/src/juce_appframework/gui/components/menus/juce_PopupMenu.cpp
+++ b/src/juce_appframework/gui/components/menus/juce_PopupMenu.cpp
@@ -321,6 +321,7 @@ public:
     {
         menuCreationTime = lastFocused = lastScroll = Time::getMillisecondCounter();
         setWantsKeyboardFocus (true);
+        setMouseClickGrabsKeyboardFocus (false);
 
         setOpaque (true);
         setAlwaysOnTop (true);
diff --git a/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp b/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
index 955c9215a5..fb40cc956e 100644
--- a/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
+++ b/src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
@@ -1050,7 +1050,7 @@ void AudioDeviceSelectorComponent::resized()
 
     if (midiInputsList != 0)
     {
-        const int bh = midiInputsList->getBestHeight (jmin (h * 8, getHeight() - y - space));
+        const int bh = midiInputsList->getBestHeight (jmin (h * 8, getHeight() - y - space - h));
         midiInputsList->setBounds (lx, y, w, bh);
         y += bh + space;
     }