diff --git a/ChangeLog b/ChangeLog
index 4846c3fd84..27f3cd2cb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
 	* configure.in: depend on stable pango-1.8, not unstable 1.7
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4846c3fd84..27f3cd2cb4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
 	* configure.in: depend on stable pango-1.8, not unstable 1.7
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4846c3fd84..27f3cd2cb4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(browse_files_model_finished_loading_cb): Don't
+	g_assert_not_reached() if we are in any other state.  Another code
+	path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
 	* configure.in: depend on stable pango-1.8, not unstable 1.7
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e55998dc9e..c2e0f8e603 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4612,7 +4612,12 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel    *model,
       /* Nothing */
     }
   else
-    g_assert_not_reached ();
+    {
+      /* We can't g_assert_not_reached(), as something other than us may have
+       *  initiated a folder reload.  See #165556.
+       */
+      return;
+    }
 
   g_assert (impl->load_timeout_id == 0);