diff --git a/ChangeLog b/ChangeLog
index 6cfd9fa0ec..61b750b663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
 2005-05-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6cfd9fa0ec..61b750b663 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
 2005-05-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6cfd9fa0ec..61b750b663 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-05-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (filter_create): Don't grab
+	the focus away from the file list when operating the filter
+	combo with the pointer.  (#304844, Sven Neumann)
+
 2005-05-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (handle_special): Map VK_APPS to
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 41c61aa8b9..25571eec22 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1842,6 +1842,8 @@ static GtkWidget *
 filter_create (GtkFileChooserDefault *impl)
 {
   impl->filter_combo = gtk_combo_box_new_text ();
+  gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+
   g_signal_connect (impl->filter_combo, "changed",
 		    G_CALLBACK (filter_combo_changed), impl);