diff --git a/ChangeLog b/ChangeLog
index eb00c5a3..74c67136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 	* src/search.c (get_history_completion): Avoid leaking memory
 	when tabbing on a string that does not occur in the history.
 	This fixes Savannah bug #47124 reported by Mike Frysinger.
+	* src/files.c (input_tab): Parse a character in the correct
+	buffer.  This fixes Savannah bug #47199.
 
 2016-02-18  Benno Schulenberg  <bensberg@justemail.net>
 	* src/search.c (do_replace_loop), src/text.c (do_int_spell_fix),
diff --git a/src/files.c b/src/files.c
index cd420d91..ad6779bd 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2830,7 +2830,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	    if (match < num_matches || matches[0][common_len] == '\0')
 		break;
 
-	    common_len += parse_mbchar(buf + common_len, NULL, NULL);
+	    common_len += parse_mbchar(matches[0] + common_len, NULL, NULL);
 	}
 
 	free(match1_mb);