diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index b1fc819d66..c6c78140f7 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -372,6 +372,13 @@ completion_match_func (GtkEntryCompletion *comp,
   return result;
 }
 
+static void
+clear_completions (GtkFileChooserEntry *chooser_entry)
+{
+  chooser_entry->has_completion = FALSE;
+  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+}
+
 /* This function will append a directory separator to paths to
  * display_name iff the path associated with it is a directory.
  * maybe_append_separator_to_path will g_free the display_name and
@@ -513,6 +520,8 @@ append_common_prefix (GtkFileChooserEntry *chooser_entry,
   gchar *common_prefix;
   GtkFilePath *unique_path;
 
+  clear_completions (chooser_entry);
+
   find_common_prefix (chooser_entry, &common_prefix, &unique_path);
 
   if (unique_path)
@@ -586,13 +595,6 @@ gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
     install_start_autocompletion_idle (chooser_entry);
 }
 
-static void
-clear_completions (GtkFileChooserEntry *chooser_entry)
-{
-  chooser_entry->has_completion = FALSE;
-  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
-}
-
 static void
 clear_completions_if_not_in_change (GtkFileChooserEntry *chooser_entry)
 {