diff --git a/ChangeLog b/ChangeLog
index 61dac2f26a..2ac960aa9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
+	Don't forget to reset reload_state when current_folder is already
+	correct.
+
 2008-10-08  Christian Dywan  <christian@imendio.com>
 
 	Bug 555270 – Allow unsetting a MessageDialog's image
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 05e2e535f8..f5a3880778 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6952,10 +6952,10 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
 	g_object_unref (impl->current_folder);
 
       impl->current_folder = g_object_ref (data->file);
-
-      impl->reload_state = RELOAD_HAS_FOLDER;
     }
 
+  impl->reload_state = RELOAD_HAS_FOLDER;
+
   /* Update the widgets that may trigger a folder change themselves.  */
 
   if (!impl->changing_folder)