diff --git a/ChangeLog b/ChangeLog
index 07006ed228..fe29f68233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-10  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_search_scroll_event): Renew
+	the flush timeout.  (#354043, Nelson Benitez)
+	
 	* gtk/gtkfilechoosersettings.c (set_unexpected_element_end_error): 
 	Improve wording. String change!  (#355126, David Lodge)
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index da34bb1ec9..cc68aae40d 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -13853,6 +13853,17 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget,
       retval = TRUE;
     }
 
+  /* renew the flush timeout */
+  if (retval && tree_view->priv->typeselect_flush_timeout
+      && !tree_view->priv->search_custom_entry_set)
+    {
+      g_source_remove (tree_view->priv->typeselect_flush_timeout);
+      tree_view->priv->typeselect_flush_timeout =
+	g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT,
+		       (GSourceFunc) gtk_tree_view_search_entry_flush_timeout,
+		       tree_view);
+    }
+
   return retval;
 }