diff --git a/Makefile b/Makefile
index 32c644f..16ba138 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0
+VERSION = git-20111101
 
 CC      = gcc
 CFLAGS  = -ansi -Wall -pedantic -O2
diff --git a/commands.c b/commands.c
index 89dcf8d..a8b9e77 100644
--- a/commands.c
+++ b/commands.c
@@ -69,10 +69,7 @@ bool it_switch_mode(arg_t a) {
 			img.slideshow = false;
 			reset_timeout(slideshow);
 		}
-		if (fileidx < tns.cnt)
-			tns.sel = fileidx;
-		else
-			tns.sel = tns.cnt > 0 ? tns.cnt - 1 : 0;
+		tns.sel = fileidx;
 		tns.dirty = true;
 		mode = MODE_THUMB;
 	} else {
diff --git a/main.c b/main.c
index 22729e9..f859090 100644
--- a/main.c
+++ b/main.c
@@ -416,10 +416,13 @@ void run(void) {
 		{
 			/* load thumbnails */
 			set_timeout(redraw, TO_REDRAW_THUMBS, false);
-			if (tns_load(&tns, tns.cnt, &files[tns.cnt], false, false))
+			if (tns_load(&tns, tns.cnt, &files[tns.cnt], false, false)) {
 				tns.cnt++;
-			else
+			} else {
 				remove_file(tns.cnt, false);
+				if (tns.sel >= tns.cnt)
+					tns.sel--;
+			}
 			if (tns.cnt == filecnt)
 				redraw();
 			else