diff --git a/ChangeLog b/ChangeLog
index aea1015057..8b6806e19c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-10  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): only start
+	typeahead search if tree_view has focus (and not one of the column
+	buttons).
+
 2007-09-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_source_info_destroy): Remove
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 7795cea30f..e36af7d641 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5340,7 +5340,8 @@ gtk_tree_view_key_press (GtkWidget   *widget,
 
   /* We pass the event to the search_entry.  If its text changes, then we start
    * the typeahead find capabilities. */
-  if (tree_view->priv->enable_search
+  if (GTK_WIDGET_HAS_FOCUS (tree_view)
+      && tree_view->priv->enable_search
       && !tree_view->priv->search_custom_entry_set)
     {
       GdkEvent *new_event;