diff --git a/ChangeLog b/ChangeLog
index 9793eaec0a..5359f3ca59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-31  Cody Russell  <bratsche@gnome.org>
+
+	Merge from trunk:
+
+	* gtk/gtkpaned.c (gtk_paned_set_position):
+	Change queue_resize() to queue_draw(), and add a check for
+	child2 != NULL in case someone calls this before there is
+	a child packed in there.  (#144269 again)
+
 2008-01-31  Richard Hult  <richard@imendio.com>
 
 	Merge from trunk, except for the reverting since that part wasn't
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 0bf8cabe0d..30053da25a 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1235,7 +1235,10 @@ gtk_paned_set_position (GtkPaned *paned,
 
 #ifdef G_OS_WIN32
   /* Hacky work-around for bug #144269 */
-  gtk_widget_queue_resize (paned->child2);
+  if (paned->child2 != NULL)
+    {
+      gtk_widget_queue_draw (paned->child2);
+    }
 #endif
 }