diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index c92d55c..6c74f62 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -7,7 +7,8 @@
 
 |0000
 
-	@hover $2 @lock $1
+	@hover $2
+	@lock $1
 
 |0100
 
@@ -56,8 +57,15 @@
 
 @<set-press> ( id* -- )
 	.hover LDZ2 ;btn-chr <draw-key-id>
-	;btn-press-chr <draw-key-id>
-	JMP2r
+	DUP2 ;btn-press-chr <draw-key-id>
+	( | event )
+	( key ) #0006 MUL2 ;layout ADD2 LDA2
+	( length ) #0010 ADD2 LDA2k SWP2 INC2 INC2
+	&l ( -- )
+		LDAk <phex>/b
+		#0a18 DEO
+		INC2 GTH2k ?&l
+	POP2 POP2 JMP2r
 
 @<set-hover> ( id* -- )
 	DUP2 .hover LDZ2 EQU2 ?{