diff --git a/src/kernal/screen/chrin_keyboard.s b/src/kernal/screen/chrin_keyboard.s
index 6fc937c9..28e41933 100644
--- a/src/kernal/screen/chrin_keyboard.s
+++ b/src/kernal/screen/chrin_keyboard.s
@@ -136,7 +136,7 @@ chrin_enter_loop:
 
 	; Set mark informing that we are returning a line
 	ldy #$01
-	sty CRSW
+	sty CRSW          ; XXX has to get previous PNTR+1, not 1
 
 	; Clear quote mode mark
 	dey                                ; set .Y to 0
@@ -158,4 +158,4 @@ chrkn_keyboard_not_enter:
 	; Print character, keep looking for input from keyboard until carriage return
 	jsr CHROUT
 	jsr pop_keyboard_buffer
-	jmp chrin_keyboard_repeat
+	+bra chrin_keyboard_read
diff --git a/src/kernal/screen_m65/mega65_chrin_keyboard.s b/src/kernal/screen_m65/mega65_chrin_keyboard.s
index 419abeae..071bd30a 100644
--- a/src/kernal/screen_m65/mega65_chrin_keyboard.s
+++ b/src/kernal/screen_m65/mega65_chrin_keyboard.s
@@ -143,7 +143,7 @@ m65_chrin_enter_loop:
 
 	; Set mark informing that we are returning a line
 	ldy #$01
-	sty CRSW
+	sty CRSW                ; XXX has to get previous PNTR+1, not 1
 
 	; Clear quote mode mark
 	dey
@@ -166,4 +166,4 @@ m65_chrin_keyboard_not_enter:
 	; Print character, keep looking for input from keyboard until carriage return
 	jsr CHROUT
 	jsr pop_keyboard_buffer
-	jmp m65_chrin_keyboard_repeat
+	bra m65_chrin_keyboard_read