diff --git a/ChangeLog b/ChangeLog
index 51f549df61..844546d5a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-29  Federico Mena Quintero  <federico@novell.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): When
+	refreshing an existing folder (i.e. when we are about to reload
+	its file list), turn off the folder's is_finished_loading flag.
+	Otherwise callers which do ::is_finished_loading() followed by
+	::list_children() will get nothing.
+
 2008-02-29  Cody Russell  <bratsche@gnome.org>
 
 	* docs/tutorial/gtk-tut.sgml: Fix tutorial documentation to
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index b426afe764..ad225afde7 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -914,6 +914,7 @@ gtk_file_system_unix_get_folder (GtkFileSystem                  *file_system,
 	  folder_unix->have_mime_type = FALSE;
 	  folder_unix->have_stat = FALSE;
 	  folder_unix->have_hidden = FALSE;
+	  folder_unix->is_finished_loading = FALSE;
 	  set_asof = TRUE;
 	}