--- a/DragAndDropManager.st	Fri Nov 22 10:44:56 2019 +0100
+++ b/DragAndDropManager.st	Fri Nov 22 15:45:33 2019 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1996 by eXept Software AG / Claus Gittinger
 	      All Rights Reserved
@@ -1458,9 +1460,7 @@
         self escapePressed.
     ].
 
-    ((aKey == #Cmd) 
-    or:[ (aKey == #Shift)
-    or:[ (aKey == #Ctrl) ]]) ifTrue:[
+    ( #( Cmd Shift Shift_R Shift_L Ctrl Control Control_L Control_R) includes:aKey) ifTrue:[
         self updateDragKind.
         "/ invoke motion, to force a redraw (of the dropKind-indicator)
         self buttonMotion:nil x:x y:y view:aView    
@@ -1563,12 +1563,14 @@
     screen := dragView device.
     screen ctrlDown ifTrue:[
         dragType := DropContext dragTypeCopy.
-    ].
-    screen metaDown ifTrue:[
-        dragType := DropContext dragTypeLink.
-    ].
-    screen shiftDown ifTrue:[
-        dragType := DropContext dragTypeMove.
+    ] ifFalse:[
+        screen metaDown ifTrue:[
+            dragType := DropContext dragTypeLink.
+        ] ifFalse:[
+            screen shiftDown ifTrue:[
+                dragType := DropContext dragTypeMove.
+            ]
+        ]
     ].
 
     dropContext dragType:dragType.