diff --git a/ChangeLog b/ChangeLog
index 9b52432dd9..294c3334f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-05  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (text_window_realize): Lower the window, to
+	prevent late-constructed text windows from covering child 
+	widgets.  (#336796, Yevgen Muntyan)
+
 	* gtk/gtkmain.c (gtk_grab_add, gtk_grab_remove, gtk_grab_notify) 
 	(gtk_grab_notify_foreach): Rework the code which emits ::grab-notify
 	signals to ensure that we emit enough signals. Also optimize the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9b52432dd9..294c3334f2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-04-05  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (text_window_realize): Lower the window, to
+	prevent late-constructed text windows from covering child 
+	widgets.  (#336796, Yevgen Muntyan)
+
 	* gtk/gtkmain.c (gtk_grab_add, gtk_grab_remove, gtk_grab_notify) 
 	(gtk_grab_notify_foreach): Rework the code which emits ::grab-notify
 	signals to ensure that we emit enough signals. Also optimize the
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 07c6bdd36c..6e2d4eb5a9 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7283,6 +7283,7 @@ text_window_realize (GtkTextWindow *win,
   
   gdk_window_show (win->window);
   gdk_window_set_user_data (win->window, win->widget);
+  gdk_window_lower (win->window);
 
   attributes.x = 0;
   attributes.y = 0;