diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 0b4d246aa5..7e86838082 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1261,9 +1261,9 @@ _gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
 
-  /* FIXME: this may need to turn on in_change, since we don't want autocompletion to start */
-
+  chooser_entry->in_change = TRUE;
   gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
+  chooser_entry->in_change = FALSE;
 }