diff --git a/libsrc/lynx/cgetc.s b/libsrc/lynx/cgetc.s
index ee4893377..bb2840b1f 100644
--- a/libsrc/lynx/cgetc.s
+++ b/libsrc/lynx/cgetc.s
@@ -20,8 +20,10 @@
 ; So the keyboard returns '1', '2', '3', 'P', 'R', 'F' or '?'.
 
 _cgetc:
+        bne     _start     
         jsr     _kbhit          ; Check for char available
         beq     _cgetc
+_start:
         lda     KBSTL
         ora     KBEDG
         ldx     #0
@@ -52,6 +54,8 @@ _cgetc:
         rts
 @L5:
         lda     KBEDG           ; No Pause pressed
+        ldx     #$00
+        stx     KBEDG
         ora     KBSTL
         bit     #$08
         beq     @L7
diff --git a/libsrc/lynx/kbhit.s b/libsrc/lynx/kbhit.s
index b606fc49a..a5126a7dc 100644
--- a/libsrc/lynx/kbhit.s
+++ b/libsrc/lynx/kbhit.s
@@ -49,8 +49,6 @@ _kbhit:
         sta     KBNPR           ; inverted previous ones pressed
         stx     KBPRV
         lda     KBEDG
-        beq     @L1
-        jmp     return1         ; Key hit
-
 @L1:    tax                     ; No new keys hit
         rts
+