diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
index eef43d6f26..d6473f477d 100644
--- a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
+++ b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
@@ -620,7 +620,7 @@ public:
         {
             ++insideToFrontCall;
 
-            if (makeActiveWindow && ! inBecomeKeyWindow)
+            if (makeActiveWindow && ! inBecomeKeyWindow && [window canBecomeKeyWindow])
                 [window makeKeyAndOrderFront: nil];
             else
                 [window orderFront: nil];
@@ -1566,7 +1566,7 @@ public:
     {
         if (window != nil)
         {
-            if (! inBecomeKeyWindow)
+            if (! inBecomeKeyWindow && [window canBecomeKeyWindow])
                 [window makeKeyWindow];
 
             [window makeFirstResponder: view];