diff --git a/ChangeLog b/ChangeLog
index 3d011fa98d..2f4f1b0e18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 570824 – [a11y] TreeView is not keyboard (re)focusable after 
+	selecting a cell in a non-sortable column
+
+	* gtk/gtktreeview.c (gtk_tree_view_header_focus): Don't grab
+	focus to a header button if it is not focusable. Problem reported
+	by Joanmarie Diggs
+
 2009-02-11  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 508545 – No way to identify terminal classes from documentation
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cd0caceaa9..5078cdb8dc 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -7707,7 +7707,7 @@ gtk_tree_view_header_focus (GtkTreeView      *tree_view,
     case GTK_DIR_DOWN:
       if (focus_child == NULL)
 	{
-	  if (tree_view->priv->focus_column != NULL)
+	  if (tree_view->priv->focus_column != NULL && GTK_WIDGET_CAN_FOCUS (tree_view->priv->focus_column->button))
 	    focus_child = tree_view->priv->focus_column->button;
 	  else
 	    focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;