diff --git a/ChangeLog b/ChangeLog
index 748546a8e9..3ac00a3b78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 558694 – Paned window splitter keynav broken
+
+	* gtk/gtkpaned.c (get_child_panes): Don't add unrealized
+	widgets.
+
 2008-12-30  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkstyle.c:
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index b774937f51..6dfdd3fcdc 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1888,6 +1888,9 @@ static void
 get_child_panes (GtkWidget  *widget,
 		 GList     **panes)
 {
+  if (!GTK_WIDGET_REALIZED (widget))
+    return;
+
   if (GTK_IS_PANED (widget))
     {
       GtkPaned *paned = GTK_PANED (widget);
@@ -1899,7 +1902,7 @@ get_child_panes (GtkWidget  *widget,
   else if (GTK_IS_CONTAINER (widget))
     {
       gtk_container_forall (GTK_CONTAINER (widget),
-			     (GtkCallback)get_child_panes, panes);
+                            (GtkCallback)get_child_panes, panes);
     }
 }