--- a/EditField.st	Fri Dec 21 04:37:46 2018 +0000
+++ b/EditField.st	Mon Jan 07 18:16:35 2019 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
@@ -1681,7 +1679,7 @@
                           #DeleteLine #GotoLine #EndOfLine #EndOfText
                           #CursorDown #CursorUp)>
 
-    |rawKey leave doAccept keyAction numArgs|
+    |rawKey leave doAccept keyAction numArgs lastEvent|
 
     enabled ifFalse:[
         ^ self
@@ -1707,9 +1705,14 @@
         keyAction := crAction.
     ].
 
-    rawKey := (WindowGroup lastEvent) rawKey.
-
-    leave := (leaveKeys includes:key) or:[leaveKeys includes:rawKey].
+    leave := leaveKeys includes:key.
+    leave ifFalse:[
+        lastEvent := WindowGroup lastEvent.
+        (lastEvent notNil and:[lastEvent isKeyEvent]) ifTrue:[
+            leave := leaveKeys includes:lastEvent rawKey.
+        ].
+    ].
+
     leave ifTrue:[
         leaveKey := key.
         doAccept := doAccept ? acceptOnLeave.
@@ -1796,6 +1799,7 @@
     "Modified: / 18-04-2018 / 11:47:58 / stefan"
     "Modified: / 09-08-2018 / 09:29:52 / Claus Gittinger"
     "Modified: / 13-08-2018 / 12:18:59 / Maren"
+    "Modified: / 07-01-2019 / 18:14:08 / Stefan Vogel"
 !
 
 keyboardZoom:largerBoolean