diff --git a/gui/notepad/src/notepad.tal b/gui/notepad/src/notepad.tal
index 1930b03..983395d 100644
--- a/gui/notepad/src/notepad.tal
+++ b/gui/notepad/src/notepad.tal
@@ -327,8 +327,12 @@
 	LDAk #20 GTH ?&no-wrap
 	DUP2 word-width .Screen/x DEI2 ADD2 #00d0 LTH2 ?&no-wrap
 	( | tabbed )
-	DUP2 find-line-start LDA2 DUP2 #093e NEQ2 ?{ POP2 #01 #0021 !<draw-linebreak> }
-	DUP2 #092d NEQ2 ?{ POP2 #01 #0022 !<draw-linebreak> }
+	DUP2 find-line-start
+	( tab line ) LDA2k #093e NEQ2 ?{ POP2 #01 #0021 !<draw-linebreak> }
+	( tab caret ) LDA2k #092d NEQ2 ?{ POP2 #01 #0022 !<draw-linebreak> }
+	#0001 SUB2
+	( lb line ) LDA2k #0a3e NEQ2 ?{ POP2 #01 #0011 !<draw-linebreak> }
+	( lb caret ) LDA2k #0a2d NEQ2 ?{ POP2 #01 #0012 !<draw-linebreak> }
 	POP2 #01 #0008 !<draw-linebreak>
 	&no-wrap ( char )
 	LDAk char-width .Screen/x DEI2 ADD2 .Screen/x DEO2
@@ -344,9 +348,10 @@
 @char-addr ( prev char -- addr* )
 	DUP #7e GTH ?&missing
 	DUP #20 LTH ?&blank
-	DUP2 #0a3e EQU2 ?&marker
 	DUP2 #093e EQU2 ?&marker
 	DUP2 #092d EQU2 ?&bullet
+	DUP2 #0a3e EQU2 ?&marker
+	DUP2 #0a2d EQU2 ?&bullet
 	NIP #20 SUB #00 SWP #50 SFT2 ;font/glyphs ADD2 JMP2r
 	&blank POP2 ;font/glyphs JMP2r
 	&missing POP2 ;error-icn JMP2r