diff --git a/src/kernal/screen/chrin_keyboard.s b/src/kernal/screen/chrin_keyboard.s
index ad649e79..752a281a 100644
--- a/src/kernal/screen/chrin_keyboard.s
+++ b/src/kernal/screen/chrin_keyboard.s
@@ -41,15 +41,15 @@ chrin_keyboard_repeat:
 	cmp INDX
 	bne chrin_keyboard_not_end_of_input
 
+	; FALLTROUGH
+
+chrin_keyboard_empty_line:
+
 	; Clear pending input and quote flags
 	lda #$00
 	sta CRSW
 	sta QTSW
 
-	; FALLTROUGH
-
-chrin_keyboard_empty_line:
-
 	; For an empty line, just return the carriage return
 
 	+ply_trash_a
@@ -142,6 +142,10 @@ chrin_enter_loop:
 	pha
 	sta CRSW
 
+	; Another empty line case
+	cmp INDX
+	bcs chrin_keyboard_empty_line
+
 	; Clear quote mode mark
 	ldy #$00
 	sty QTSW
diff --git a/src/kernal/screen_m65/mega65_chrin_keyboard.s b/src/kernal/screen_m65/mega65_chrin_keyboard.s
index 2da187f3..87c81af6 100644
--- a/src/kernal/screen_m65/mega65_chrin_keyboard.s
+++ b/src/kernal/screen_m65/mega65_chrin_keyboard.s
@@ -35,16 +35,16 @@ m65_chrin_keyboard_repeat:
 	cmp INDX
 	bne m65_chrin_keyboard_not_end_of_input
 
+	; FALLTROUGH
+
+m65_chrin_keyboard_empty_line:
+
 	; Clear pending input and quote flags
 
 	lda #$00
 	sta CRSW
 	sta QTSW
 
-	; FALLTROUGH
-
-m65_chrin_keyboard_empty_line:
-
 	; For an empty line, just return the carriage return
 
 	lda #$0D
@@ -149,6 +149,10 @@ m65_chrin_enter_loop:
 	pha
 	sta CRSW
 
+	; Another empty line case
+	cmp INDX
+	bcs m65_chrin_keyboard_empty_line
+
 	; Clear quote mode mark
 	ldy #$00
 	sty QTSW