diff --git a/ChangeLog b/ChangeLog
index 61399d19f8..1d8682c137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
+	if they are blocked.
+
 	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
 	crash if enable_search is FALSE.  (#161267, Jorn Baayen)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 61399d19f8..1d8682c137 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
+	if they are blocked.
+
 	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
 	crash if enable_search is FALSE.  (#161267, Jorn Baayen)
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 61399d19f8..1d8682c137 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
+	if they are blocked.
+
 	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
 	crash if enable_search is FALSE.  (#161267, Jorn Baayen)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 61399d19f8..1d8682c137 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
+	if they are blocked.
+
 	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
 	crash if enable_search is FALSE.  (#161267, Jorn Baayen)
 
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index a35e91ea08..cba1d76bac 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2158,14 +2158,18 @@ dialog_response_cb (GtkDialog *dialog,
 
   update_label_and_image (user_data);
   update_combo_box (user_data);
+  
+  if (priv->active)
+    {
+      g_signal_handler_unblock (priv->dialog,
+				priv->dialog_folder_changed_id);
+      g_signal_handler_unblock (priv->dialog,
+				priv->dialog_file_activated_id);
+      g_signal_handler_unblock (priv->dialog,
+				priv->dialog_selection_changed_id);
+      priv->active = FALSE;
+    }
 
-  g_signal_handler_unblock (priv->dialog,
-			    priv->dialog_folder_changed_id);
-  g_signal_handler_unblock (priv->dialog,
-			    priv->dialog_file_activated_id);
-  g_signal_handler_unblock (priv->dialog,
-			    priv->dialog_selection_changed_id);
-  priv->active = FALSE;
   gtk_widget_set_sensitive (priv->combo_box, TRUE);
   gtk_widget_hide (priv->dialog);
 }