diff --git a/ChangeLog b/ChangeLog
index fdde01f149..697a31da55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_value_changed): Don't call
+	gdk_window_invalidate_rect() on unrealized widgets.  (#335717,
+	Nicolas Setton)
+
 Fri Mar 24 14:53:20 2006  Tim Janik  <timj@imendio.com>
 
 	* gtk/gtktreemodel.h: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fdde01f149..697a31da55 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-03-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_value_changed): Don't call
+	gdk_window_invalidate_rect() on unrealized widgets.  (#335717,
+	Nicolas Setton)
+
 Fri Mar 24 14:53:20 2006  Tim Janik  <timj@imendio.com>
 
 	* gtk/gtktreemodel.h: 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9b029f4ef6..b338955fd1 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6634,7 +6634,8 @@ gtk_text_view_value_changed (GtkAdjustment *adj,
        */
       if (text_view->width_changed)
 	{
-	  gdk_window_invalidate_rect (text_view->text_window->bin_window, NULL, FALSE);
+	  if (GTK_WIDGET_REALIZED (text_view))
+	    gdk_window_invalidate_rect (text_view->text_window->bin_window, NULL, FALSE);
 	  
 	  text_view->width_changed = FALSE;
 	}