diff --git a/ChangeLog b/ChangeLog
index 948ed5e6f5..5c58203225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 948ed5e6f5..5c58203225 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 948ed5e6f5..5c58203225 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+2005-06-14  Federico Mena Quintero  <federico@ximian.com>
+
+	Merged from gtk-2-6:
+
+	Fix #302087:
+
+	* gtk/gtkfilechooserdefault.c (list_selection_changed): Emit
+	"selection-changed" and do the normal housekeeping even if we are
+	in SAVE mode and there is nothing selected.  We didn't emit that
+	signal if we were in SAVE mode and unselect_all() got called.
+	(gtk_file_chooser_default_unselect_all): Call
+	pending_select_paths_free() so that we cancel any asynchronous
+	selections.
+	(gtk_file_chooser_default_set_current_name): Likewise.
+
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 64379d0e24..3b18ef0f01 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5043,6 +5043,7 @@ gtk_file_chooser_default_set_current_name (GtkFileChooser *chooser,
   g_return_if_fail (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
 		    || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
 
+  pending_select_paths_free (impl);
   _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->save_file_name_entry), name);
 }
 
@@ -5181,6 +5182,7 @@ gtk_file_chooser_default_unselect_all (GtkFileChooser *chooser)
   GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
 
   gtk_tree_selection_unselect_all (selection);
+  pending_select_paths_free (impl);
 }
 
 /* Checks whether the filename entry for the Save modes contains a well-formed filename.
@@ -6219,7 +6221,7 @@ list_selection_changed (GtkTreeSelection      *selection,
       g_assert (!impl->select_multiple);
       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
       if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
-	return;
+	goto out; /* normal processing */
 
       gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model,
 						      &child_iter,
@@ -6230,6 +6232,8 @@ list_selection_changed (GtkTreeSelection      *selection,
 	return; /* We are on the editable row for New Folder */
     }
 
+ out:
+
   update_chooser_entry (impl);
   check_preview_change (impl);
   bookmarks_check_add_sensitivity (impl);