diff --git a/c64/kernal/screen/screen_advance_to_next_line.s b/c64/kernal/screen/screen_advance_to_next_line.s
index b55f7018..0a8f2baa 100644
--- a/c64/kernal/screen/screen_advance_to_next_line.s
+++ b/c64/kernal/screen/screen_advance_to_next_line.s
@@ -2,10 +2,6 @@
 
 screen_advance_to_next_line:
 
-	// Go to start of the line
-	lda #0
-	sta PNTR
-
 	// Check if we are at the bottom of the screen
 	ldy TBLX
 	cpy #$24
@@ -16,4 +12,17 @@ screen_advance_to_next_line:
 	skip_2_bytes_trash_nvz
 !:
 	inc TBLX
+
+	// Set PNTR to 0 or 40 (for continued line)
+	ldy TBLX
+	lda LDTBL, y
+	and #$80
+	bne !+
+
+	lda #40
+	skip_2_bytes_trash_nvz
+!:
+	lda #$00
+	sta PNTR
+
 	jmp chrout_screen_calc_lptr_done