diff --git a/scorch.asm b/scorch.asm
index 8b57290..8857257 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -1175,6 +1175,9 @@ nextishigher
         
       lda kbcode
       and #$3f ;CTRL and SHIFT ellimination
+      cmp #28  ; ESC
+      bne getkeyend
+        mvx #1 escFlag
       bne getkeyend
 
 checkJoyGetKey
diff --git a/scorch.xex b/scorch.xex
index 353b94c..30471a3 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/textproc.asm b/textproc.asm
index c886738..9a38ef6 100755
--- a/textproc.asm
+++ b/textproc.asm
@@ -30,13 +30,10 @@ OptionsMainLoop
 
     jsr OptionsInversion
     jsr getkey
-    cmp #28  ; ESC
-
-    bne @+
-      mva #1 escFlag
-      rts
+    ldx escFlag
+    seq:rts
        
-@   cmp #$f  ;cursor down
+    cmp #$f  ;cursor down
     bne OptionsNoDown
     inc:lda OptionsY
     cmp #maxoptions
@@ -879,11 +876,9 @@ endOfTankName
 
 CheckKeys
     jsr getkey
-    cmp #28  ; ESC
-    bne @+
-    mva #1 escFlag
-    rts
-@
+    ldx escFlag
+    seq:rts
+    
     ; is the char to be recorded?
     ldx #keycodesEnd-keycodes ;table was 38 chars long
 IsLetter