diff --git a/src/index.c b/src/index.c
index 4c003214..e835e462 100644
--- a/src/index.c
+++ b/src/index.c
@@ -94,7 +94,11 @@ void init_index_mode(void)
 	text_area_h = fh + 5;
 
 	/* This includes the text area for index data */
-	tot_thumb_h = opt.thumb_h + text_area_h;
+	if(opt.montage) {
+		tot_thumb_h = opt.thumb_h;
+	} else {
+		tot_thumb_h = opt.thumb_h + text_area_h;
+	}
 
 	/* Use bg image dimensions for default size */
 	if (opt.bg && opt.bg_file) {
diff --git a/src/options.c b/src/options.c
index d3524f78..8118a58f 100644
--- a/src/options.c
+++ b/src/options.c
@@ -633,6 +633,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 			break;
 		case OPTION_montage:
 			opt.index = 1;
+			opt.montage = 1;
 			break;
 		case OPTION_reverse:
 			opt.reverse = 1;