diff --git a/ChangeLog b/ChangeLog
index 7ec91065bf..48f2512f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): Change the
+	keynav for header reordering and resizing to Alt-arrows and
+	Shift-Alt-arrows, following a proposal by the keynav 
+	authority. (#308666, Calum Benson)
+
 	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
 	a leftover debugging envvar.  
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7ec91065bf..48f2512f78 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): Change the
+	keynav for header reordering and resizing to Alt-arrows and
+	Shift-Alt-arrows, following a proposal by the keynav 
+	authority. (#308666, Calum Benson)
+
 	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
 	a leftover debugging envvar.  
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7ec91065bf..48f2512f78 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): Change the
+	keynav for header reordering and resizing to Alt-arrows and
+	Shift-Alt-arrows, following a proposal by the keynav 
+	authority. (#308666, Calum Benson)
+
 	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Remove
 	a leftover debugging envvar.  
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index e3bf7069e3..40072b75ba 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4207,9 +4207,10 @@ gtk_tree_view_key_press (GtkWidget   *widget,
       return TRUE;
     }
 
-  if (tree_view->priv->columns && (event->state & GDK_SHIFT_MASK)
-      && (event->keyval == GDK_Left || event->keyval == GDK_KP_Left
-          || event->keyval == GDK_Right || event->keyval == GDK_KP_Right))
+  if (tree_view->priv->columns && 
+      (event->state & GDK_SHIFT_MASK) && (event->state & GDK_MOD1_MASK) &&
+      (event->keyval == GDK_Left || event->keyval == GDK_KP_Left
+       || event->keyval == GDK_Right || event->keyval == GDK_KP_Right))
     {
       list = tree_view->priv->columns;
       while (list)
@@ -4259,7 +4260,7 @@ gtk_tree_view_key_press (GtkWidget   *widget,
 	}
     }
 
-  if (tree_view->priv->columns && (event->state & GDK_CONTROL_MASK) &&
+  if (tree_view->priv->columns && (event->state & GDK_MOD1_MASK) &&
       (event->keyval == GDK_Left || event->keyval == GDK_KP_Left
        || event->keyval == GDK_Right || event->keyval == GDK_KP_Right
        || event->keyval == GDK_Home || event->keyval == GDK_KP_Home