diff --git a/ChangeLog b/ChangeLog
index bcbc1cfe09..6ebb361f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-16  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from trunk:
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): send
+	a focus-in event to the tree view after hiding the search dialog.
+	(#356515, Rich Burridge, Peter Parente).
+
 2007-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	Merged from trunk:
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index a3609d2b83..6d6abfe81e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -13686,6 +13686,7 @@ gtk_tree_view_search_dialog_hide (GtkWidget   *search_dialog,
   send_focus_change (GTK_WIDGET (tree_view->priv->search_entry), FALSE);
   gtk_widget_hide (search_dialog);
   gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), "");
+  send_focus_change (GTK_WIDGET (tree_view), TRUE);
 }
 
 static void