diff --git a/ChangeLog b/ChangeLog
index db5d00b53e3a7c617f9e0bdd46560a9c7402c1b5..faa63b5cbd68a42e0b09c81e32a08ccbea15ecb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-22  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_scroll_to_cell): check for the
+	widget being realized, in addition to being visible, to avoid
+	running into precondition check in gtk_tree_view_get_cell_area().
+	(approved by Kris).
+
 2005-10-22  Dom Lachowicz <cinamod@hotmail.com>
 
 	* modules/engines/ms-windows/msw_style.c (setup_msw_rc_style): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db5d00b53e3a7c617f9e0bdd46560a9c7402c1b5..faa63b5cbd68a42e0b09c81e32a08ccbea15ecb0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-10-22  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_scroll_to_cell): check for the
+	widget being realized, in addition to being visible, to avoid
+	running into precondition check in gtk_tree_view_get_cell_area().
+	(approved by Kris).
+
 2005-10-22  Dom Lachowicz <cinamod@hotmail.com>
 
 	* modules/engines/ms-windows/msw_style.c (setup_msw_rc_style): 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d1f62ffdcd62a59651372168d7c308bf55b300de..50cf27924d0d4aff5c6dba226e2f8aa36b50823b 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10377,6 +10377,7 @@ gtk_tree_view_scroll_to_cell (GtkTreeView       *tree_view,
    * it is much slower than just going to the point.
    */
   if (! GTK_WIDGET_VISIBLE (tree_view) ||
+      ! GTK_WIDGET_REALIZED (tree_view) ||
       GTK_WIDGET_ALLOC_NEEDED (tree_view) || 
       GTK_RBNODE_FLAG_SET (tree_view->priv->tree->root, GTK_RBNODE_DESCENDANTS_INVALID))
     {