diff --git a/ChangeLog b/ChangeLog
index 937086d65de6d9a21eacf6fa0a3b3c5e043109df..ad525a6ded1d87d7d4b86538dde3f11f12b2da71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 937086d65de6d9a21eacf6fa0a3b3c5e043109df..ad525a6ded1d87d7d4b86538dde3f11f12b2da71 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 937086d65de6d9a21eacf6fa0a3b3c5e043109df..ad525a6ded1d87d7d4b86538dde3f11f12b2da71 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-01-27  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_select_path): Oops, don't assert that we
+	can't reach the end of the function; this happens if we are still
+	loading but don't need a path change.  Fixes #165213.
+
 2005-01-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog,
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 46782e3d51d311ea53b0cf51d3e0aa967446f8c4..77a14c4c137228896ce780838e512dbe8fd9c622 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4848,8 +4848,7 @@ gtk_file_chooser_default_select_path (GtkFileChooser    *chooser,
       return result;
     }
 
-  g_assert_not_reached ();
-  return FALSE;
+  return TRUE;
 }
 
 static void