diff --git a/ChangeLog b/ChangeLog
index e62be520a1..479da197d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-11  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate_columns): queue
+	a draw for the entire widget if any column changes width. (Fixes
+	#311026, reported by Frederic Crozat).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
 	* configure.in: Revert to linking against pangowin32 under win32
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e62be520a1..479da197d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-11  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate_columns): queue
+	a draw for the entire widget if any column changes width. (Fixes
+	#311026, reported by Frederic Crozat).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
 	* configure.in: Revert to linking against pangowin32 under win32
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e62be520a1..479da197d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-11  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate_columns): queue
+	a draw for the entire widget if any column changes width. (Fixes
+	#311026, reported by Frederic Crozat).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
 	* configure.in: Revert to linking against pangowin32 under win32
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 13d974a39d..68a99a5ba9 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1907,6 +1907,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
   gint extra, extra_per_column;
   gint full_requested_width = 0;
   gint number_of_expand_columns = 0;
+  gboolean column_changed = FALSE;
   gboolean rtl;
   
   tree_view = GTK_TREE_VIEW (widget);
@@ -2009,7 +2010,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
       width += column->width;
 
       if (column->width > old_width)
-	invalidate_column (tree_view, column);
+        column_changed = TRUE;
 
       gtk_widget_size_allocate (column->button, &allocation);
 
@@ -2019,6 +2020,9 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
 				allocation.y,
                                 TREE_VIEW_DRAG_WIDTH, allocation.height);
     }
+
+  if (column_changed)
+    gtk_widget_queue_draw (GTK_WIDGET (tree_view));
 }