Index: gtk/gtktreeview.c
===================================================================
--- gtk/gtktreeview.c	(Revision 20742)
+++ gtk/gtktreeview.c	(Arbeitskopie)
@@ -2486,8 +2486,8 @@ gtk_tree_view_button_press (GtkWidget   
       gboolean rtl;
       gboolean node_selected;
 
-      /* Empty tree? */
-      if (tree_view->priv->tree == NULL)
+      /* Empty tree or not focussable? */
+      if (tree_view->priv->tree == NULL || !GTK_WIDGET_CAN_FOCUS (widget))
 	{
 	  grab_focus_and_unset_draw_keyfocus (tree_view);
 	  return TRUE;
@@ -7779,7 +7779,7 @@ gtk_tree_view_focus (GtkWidget        *w
   GtkContainer *container = GTK_CONTAINER (widget);
   GtkWidget *focus_child;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (container))
+  if (!GTK_WIDGET_IS_SENSITIVE (container) || !GTK_WIDGET_CAN_FOCUS (widget))
     return FALSE;
 
   focus_child = container->focus_child;
