diff --git a/src/left.tal b/src/left.tal
index dc6fc51..a5a3748 100644
--- a/src/left.tal
+++ b/src/left.tal
@@ -1221,10 +1221,14 @@
 	( width* ) get-glyph-width STH2
 	( draw2 ) get-color .Screen/sprite
 	( draw1 ) DUPr [ LITr 08 LTHr JMPr DEOk ] DEO
-	( [ LIT2 00 -state/underline ] LDZ EQU ?{
-		DEO2kr
-		;underline-icn .Screen/addr DEO2
-		[ LIT2 05 -Screen/sprite ] DEOk DEO } )
+	.state/underline LDZ ?draw-underline
+	ADD2r [ LITr -Screen/x ] DEO2r
+	JMP2r
+
+@draw-underline ( addr* -- addr* )
+	OVR2r [ LITr -Screen/x ] DEO2r
+	;underline-icn .Screen/addr DEO2
+	[ LIT2 05 -Screen/sprite ] DEOk DEO
 	ADD2r [ LITr -Screen/x ] DEO2r
 	JMP2r