diff --git a/desktop/mgtk.s b/desktop/mgtk.s
index ca8e9fd..7d63f76 100644
--- a/desktop/mgtk.s
+++ b/desktop/mgtk.s
@@ -5391,10 +5391,12 @@ ret:    clc
 check_kbd_flag:  .byte   $80
 
 .proc SetKeyEventImpl
-        params := $82
+        PARAM_BLOCK params, $82
+handle_keys:    .res    1
+        END_PARAM_BLOCK
 
         asl     check_kbd_flag
-        ror     params
+        ror     params::handle_keys
         ror     check_kbd_flag
         rts
 .endproc
@@ -6021,9 +6023,8 @@ which_key: .byte   0
 key_mods:  .byte   0
         END_PARAM_BLOCK
 
-
         lda     params::which_key
-        cmp     #$1B                     ; escape key
+        cmp     #CHAR_ESCAPE
         bne     :+
 
         lda     params::key_mods
@@ -6031,7 +6032,6 @@ key_mods:  .byte   0
         jsr     KeyboardMouse
         jmp     MenuSelectImpl
 
-
 :       lda     #find_mode_by_shortcut
         jsr     find_menu
         beq     not_found