diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index e319834..70108b6 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -116,7 +116,7 @@
 	POP2 BRK
 
 	&scroll ( distance -> )
-	.selection/scroll LDZ ADD DUP #ff NEQ ?{ POP BRK }
+	.selection/scroll LDZ ADD INCk ?{ POP BRK }
 	.lines/folders LDZ .lines/tracks LDZ ADD #18 SUB
 	( needs scroll ) DUP #80 LTH ?{ POP2 BRK }
 	( max scroll ) LTHk [ JMP SWP POP ] .selection/scroll STZ
@@ -215,10 +215,20 @@
 
 @<move> ( mod -- )
 	.selection LDZ ADD
+	( top ) INCk ?{ POP JMP2r }
 	( bottom ) DUP .lines/folders LDZ .lines/tracks LDZ ADD NEQ ?{ POP JMP2r }
 	( >> )
 
 @<select> ( id -- )
+	( | follow )
+	DUP .selection/scroll LDZ SUB
+	( top ) DUP #80 AND #00 EQU ?{
+		DUP .selection/scroll LDZ ADD .selection/scroll STZ !&resume }
+	( bottom ) DUP #18 LTH ?{
+		DUP .selection/scroll LDZ ADD #17 SUB .selection/scroll STZ }
+	&resume ( id scroll -- )
+	POP
+	( | continue )
 	[ LIT &last ff ] NEQk ?{ POP2 JMP2r }
 	POP DUP ,&last STR
 	.selection STZ !<redraw-dir>
@@ -527,7 +537,7 @@
 	( >> )
 
 @<draw-tracks> ( -- )
-	.selection LDZ ,&sel STR
+	.selection LDZ .lines/folders LDZ SUB ,&sel STR
 	#0008 .Screen/x DEO2
 	.lines/tracks LDZ #00 NEQk ?{ POP2 JMP2r }
 	.selection/scroll LDZ .lines/folders LDZ LTH ?{