diff --git a/ChangeLog b/ChangeLog
index e68b197067..42e0109906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-09  Christian Dywan  <christian@imendio.com>
+
+	Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window
+
+	* gtk/gtkwidget.c (gtk_widget_real_grab_focus):
+        Test for GTK_IS_WINDOW instead of GTK_WIDGET_TOPLEVEL
+
 2008-10-09  Christian Dywan  <christian@imendio.com>
 
 	Bug 555573 – gtk_font_selection_set_font_name
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b6b8d3da82..f5b2fd18cc 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5096,7 +5096,7 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
        * be set by the next loop.
        */
       toplevel = gtk_widget_get_toplevel (focus_widget);
-      if (GTK_WIDGET_TOPLEVEL (toplevel))
+      if (GTK_IS_WINDOW (toplevel))
 	{
 	  widget = GTK_WINDOW (toplevel)->focus_widget;