diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index eb4405ccd0..c574e2b7c8 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -109,6 +109,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
     // Text
     QString m_composingText;
     QPointer<QObject> m_composingFocusObject;
+    NSDraggingContext m_lastSeenContext;
 }
 
 - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow
@@ -130,6 +131,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
         m_lastKeyDead = false;
         m_sendKeyEvent = false;
         m_currentlyInterpretedKeyEvent = nil;
+        m_lastSeenContext = NSDraggingContextWithinApplication;
     }
     return self;
 }
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
index 06b917945a..f5bb25c300 100644
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@@ -45,8 +45,8 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
 - (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context
 {
     Q_UNUSED(session);
-    Q_UNUSED(context);
 
+    m_lastSeenContext = context;
     QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
     return qt_mac_mapDropActions(nativeDrag->currentDrag()->supportedActions());
 }
@@ -61,8 +61,11 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     //
     // Since Qt already takes care of tracking the keyboard modifiers, we
     // don't need (or want) Cocoa to filter anything. Instead, we'll let
-    // the application do the actual filtering.
-    return YES;
+    // the application do the actual filtering. But only while dragging
+    // within application, otherwise ignored modifiers may end up in a
+    // wrong drop operation executed.
+
+    return m_lastSeenContext == NSDraggingContextWithinApplication;
 }
 
 - (BOOL)wantsPeriodicDraggingUpdates
@@ -250,6 +253,8 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     Q_UNUSED(screenPoint);
     Q_UNUSED(operation);
 
+    m_lastSeenContext = NSDraggingContextWithinApplication;
+
     if (!m_platformWindow)
         return;