diff --git a/ChangeLog b/ChangeLog
index d003bcf0e0..b74b40075a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-08  Christian Dywan  <christian@imendio.com>
+
+	Bug 555387 – Changing the sensitivity of a statusbar
+	mistakenly requires a display
+
+	* gtk/gtkstatusbar.c (set_grip_cursor): Only change the cursor
+        of the resize grip if there is a grip window.
+
 2008-10-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktooltip.c (gtk_tooltip_show_tooltip): Avoid unitialized
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index a2fa89e114..2bddfa88b6 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -586,7 +586,7 @@ get_grip_rect (GtkStatusbar *statusbar,
 static void
 set_grip_cursor (GtkStatusbar *statusbar)
 {
-  if (statusbar->has_resize_grip)
+  if (statusbar->has_resize_grip && statusbar->grip_window != NULL)
     {
       GtkWidget *widget = GTK_WIDGET (statusbar);
       GdkDisplay *display = gtk_widget_get_display (widget);