diff --git a/src/files.c b/src/files.c
index 4bb842176c41029b50b6209f141ff27f55e3dc8e..b313901175231b0d8b6d3156163b3ae95087067f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2213,9 +2213,9 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
 		*lastwastab == FALSE))
 	    beep();
 
-	/* If there is more match to display on the statusbar, show it.
-	 * We reset lastwastab to FALSE: it requires hitting Tab twice
-	 * in succession with no statusbar changes to see a match
+	/* If there is more of a match to display on the statusbar, show
+	 * it.  We reset lastwastab to FALSE: it requires hitting Tab
+	 * twice in succession with no statusbar changes to see a match
 	 * list. */
 	if (common_len != *place) {
 	    size_t buflen = strlen(buf);
@@ -2239,10 +2239,12 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
 
 	    for (match = 0; match < num_matches; match++) {
 		common_len = strnlenpt(matches[match], COLS - 1);
+
 		if (common_len > COLS - 1) {
 		    longest_name = COLS - 1;
 		    break;
 		}
+
 		if (common_len > longest_name)
 		    longest_name = common_len;
 	    }