diff --git a/ChangeLog b/ChangeLog
index a0b8cdb38f..4f47af3f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-27  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_queue_draw_arrow): really fix
+	#333284.
+
 2006-05-27  Kristian Rietveld  <kris@gtk.org>
 
 	Editable cell window placement and RTL fixes.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a0b8cdb38f..4f47af3f25 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-27  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_queue_draw_arrow): really fix
+	#333284.
+
 2006-05-27  Kristian Rietveld  <kris@gtk.org>
 
 	Editable cell window placement and RTL fixes.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 32cc9702e2..588ff3f27a 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8535,7 +8535,7 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView      *tree_view,
     return;
 
   rect.x = 0;
-  rect.width = MAX (tree_view->priv->expander_size, tree_view->priv->width);
+  rect.width = MAX (tree_view->priv->expander_size, MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width));
 
   rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
   rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));