diff --git a/ChangeLog b/ChangeLog
index f2583e365a..869afba1ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_entry_flush_timeout): Return
+	FALSE, so we don't flush repeatedly.  (#319151, Alexander Larsson)
+
 2005-10-27  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkthemes.c (gtk_theme_engine_load): fix typo
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2583e365a..869afba1ae 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_entry_flush_timeout): Return
+	FALSE, so we don't flush repeatedly.  (#319151, Alexander Larsson)
+
 2005-10-27  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkthemes.c (gtk_theme_engine_load): fix typo
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5ed02f1a1e..c946af7922 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9036,7 +9036,7 @@ gtk_tree_view_search_entry_flush_timeout (GtkTreeView *tree_view)
 
   GDK_THREADS_LEAVE ();
 
-  return TRUE;
+  return FALSE;
 }
 
 /* Cut and paste from gtkwindow.c */