diff --git a/Makefile b/Makefile
index d6360b8..916f7b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20111027
+VERSION = git-20111031
 
 CC      = gcc
 CFLAGS  = -ansi -Wall -pedantic -O2
diff --git a/commands.c b/commands.c
index a8b9e77..89dcf8d 100644
--- a/commands.c
+++ b/commands.c
@@ -69,7 +69,10 @@ bool it_switch_mode(arg_t a) {
 			img.slideshow = false;
 			reset_timeout(slideshow);
 		}
-		tns.sel = fileidx;
+		if (fileidx < tns.cnt)
+			tns.sel = fileidx;
+		else
+			tns.sel = tns.cnt > 0 ? tns.cnt - 1 : 0;
 		tns.dirty = true;
 		mode = MODE_THUMB;
 	} else {