diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index 4ada266..286f512 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -83,9 +83,8 @@
 	( > ) [ LIT2 00 -playing ] LDZ EQU ?{ DUP2 #0098 LTH2 ?&player }
 	( | on list )
 	<y-id>
-	.Mouse/state DEI DUP ?{ POP <select>
+	.Mouse/state DEI ?{ <select>
 		BRK }
-	#01 GTH .selection/mod STZ
 	<pick>
 	;on-mouse-locked .Mouse/vector DEO2
 	BRK
@@ -119,7 +118,6 @@
 	( | key )
 	.Controller/key DEI
 	( esc ) DUP #1b NEQ ?{ <escape> }
-	( tab ) DUP #09 NEQ ?{ <toggle-misc> }
 	( enter ) DUP #0d NEQ ?{ .selection LDZ <pick> }
 	( space ) DUP #20 NEQ ?{ <send-pause> }
 	POP
@@ -164,9 +162,14 @@
 @|controls )
 
 @<skip-prev> ( -- )
+	.lines/tracks LDZ ?{ JMP2r }
+	.selection/track LDZ #01 SUB DUP #ff NEQ ?{
+		POP .lines/tracks LDZ #01 SUB }
+	!<pick>/tracks
 	JMP2r
 
 @<skip-next> ( -- )
+	.lines/tracks LDZ ?{ JMP2r }
 	.selection/track LDZ INC .lines/tracks LDZ DIVk MUL SUB !<pick>/tracks
 
 @<seek> ( x* -- )
@@ -352,9 +355,6 @@
 	;path/null LDA ?<leave>
 	JMP2r
 
-@<toggle-misc> ( -- )
-	[ LIT2 00 -misc ] LDZ EQU .misc STZ !fit-window
-
 @count-lines ( -- lines )
 	.lines/folders LDZ .lines/tracks LDZ ADD
 	( ) [ LIT2 00 -misc ] LDZ EQU ?{ .lines/misc LDZ ADD }