diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index 639573d..22eee90 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -183,7 +183,8 @@
 	#0006 MUL2 ;layout ADD2
 	( ) STH2k #0004 ADD2 LDA2
 	( ) STH2kr #0002 ADD2 LDA2
-	( ) STH2r LDA2 STH2r !<draw-key>
+	( ) STH2r LDA2 STH2r
+	( >> )
 
 @<draw-key> ( a* b* c* frame* -- )
 	DUP2 ;btn-hover-chr EQU2 STH
@@ -223,9 +224,7 @@
 	.Screen/x DEI2k #0008 SUB2 ROT DEO2
 	.Screen/y DEI2k #0016 ADD2 ROT DEO2
 	;keys/space #05 <draw-glyph>
-	( | draw hint )
-	<draw-hint>
-	JMP2r
+	( >> )
 
 @<draw-hint> ( -- )
 	( | clear )