diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
index a5826f034e..eba34376e0 100644
--- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
+++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
@@ -502,9 +502,17 @@ public:
 
     void redirectMouseMove (NSEvent* ev)
     {
-        currentModifiers = currentModifiers.withoutMouseButtons();
-        sendMouseEvent (ev);
-        showArrowCursorIfNeeded();
+        if ([NSWindow windowNumberAtPoint: [[ev window] convertBaseToScreen: [ev locationInWindow]]
+              belowWindowWithWindowNumber: 0] == [window windowNumber])
+        {
+            currentModifiers = currentModifiers.withoutMouseButtons();
+            sendMouseEvent (ev);
+            showArrowCursorIfNeeded();
+        }
+        else
+        {
+            [[NSCursor arrowCursor] set];
+        }
     }
 
     void redirectMouseEnter (NSEvent* ev)