diff --git a/ChangeLog b/ChangeLog
index 6e18f8f93f..68845b309c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	Reinstate the previous behavior for clicking Ok after
+	activating a bookmark or path bar button in folder 
+	modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #159656:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6e18f8f93f..68845b309c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	Reinstate the previous behavior for clicking Ok after
+	activating a bookmark or path bar button in folder 
+	modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #159656:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6e18f8f93f..68845b309c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	Reinstate the previous behavior for clicking Ok after
+	activating a bookmark or path bar button in folder 
+	modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #159656:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6e18f8f93f..68845b309c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
+	Reinstate the previous behavior for clicking Ok after
+	activating a bookmark or path bar button in folder 
+	modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #159656:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 7e10083c27..c688ff2536 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4900,11 +4900,16 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
 
       selection_check (impl, &num_selected, &all_files, &all_folders);
 
-      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-	  || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
 	{
-	  if (num_selected > 0)
-	    return TRUE;
+	  if (num_selected != 1) 	 
+	    return TRUE; /* zero means current folder; more than one means use the whole selection */ 	 
+	  else if (current_focus != impl->browse_files_tree_view) 	 
+	    {
+	      /* a single folder is selected and a button was clicked */
+	      switch_to_selected_folder (impl); 	 
+	      return TRUE;
+	    }
 	}
 
       if (num_selected == 0)