--- a/DisplaySurface.st	Sat Aug 12 13:22:38 2017 +0200
+++ b/DisplaySurface.st	Thu Aug 17 10:13:38 2017 +0200
@@ -1589,6 +1589,8 @@
 
         focusView
             dispatchEvent:delegatedEvent
+            type:delegatedEvent type
+            arguments:(delegatedEvent arguments)
             withFocusOn:nil
             delegate:doDelegate.
         ^ self
@@ -1653,7 +1655,7 @@
      if there is a controller, that one gets all user events
     "
     eventReceiver := self.
-    (controller := self controller) notNil ifTrue:[
+    ((controller := self controller) notNil and:[controller ~~ eventReceiver]) ifTrue:[
         (isKeyEvent
          or:[isButtonEvent
          or:[isMouseWheelEvent
@@ -1688,8 +1690,8 @@
 
     eventReceiver perform:selector withArguments:argArray
 
-    "Created: / 20.5.1998 / 22:46:25 / cg"
-    "Modified: / 21.5.1999 / 19:55:31 / cg"
+    "Created: / 20-05-1998 / 22:46:25 / cg"
+    "Modified: / 17-08-2017 / 09:47:01 / cg"
 !
 
 dispatchEvent:event withFocusOn:focusViewOrNil