diff --git a/ChangeLog b/ChangeLog
index 63f30b339d..ada395272e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct  5 00:53:15 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_list_children_in_focus_order):
+	focus arrow before pack_end items (#123851, Matthias Clasen)
+
 Fri Oct  3 20:50:48 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): only set the model
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 63f30b339d..ada395272e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Oct  5 00:53:15 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_list_children_in_focus_order):
+	focus arrow before pack_end items (#123851, Matthias Clasen)
+
 Fri Oct  3 20:50:48 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): only set the model
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 63f30b339d..ada395272e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Oct  5 00:53:15 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_list_children_in_focus_order):
+	focus arrow before pack_end items (#123851, Matthias Clasen)
+
 Fri Oct  3 20:50:48 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): only set the model
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 63f30b339d..ada395272e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Oct  5 00:53:15 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_list_children_in_focus_order):
+	focus arrow before pack_end items (#123851, Matthias Clasen)
+
 Fri Oct  3 20:50:48 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): only set the model
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 63f30b339d..ada395272e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Oct  5 00:53:15 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktoolbar.c (gtk_toolbar_list_children_in_focus_order):
+	focus arrow before pack_end items (#123851, Matthias Clasen)
+
 Fri Oct  3 20:50:48 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): only set the model
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index dd5e8328d5..4eea8f57d6 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1377,6 +1377,8 @@ gtk_toolbar_list_children_in_focus_order (GtkToolbar       *toolbar,
 	result = g_list_prepend (result, item);
     }
 
+  result = g_list_prepend (result, priv->arrow_button);
+
   for (list = priv->items; list != NULL; list = list->next)
     {
       GtkToolItem *item = list->data;
@@ -1385,8 +1387,6 @@ gtk_toolbar_list_children_in_focus_order (GtkToolbar       *toolbar,
 	result = g_list_prepend (result, item);
     }
 
-  result = g_list_prepend (result, priv->arrow_button);
-
   rtl = (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL);
   
   /* move in logical order when