diff --git a/ChangeLog b/ChangeLog
index 00cf6f9dd9..2fd4c94569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkexpander.c (gtk_expander_realize): A NO_WINDOW widget
+	must not set the background of its window.  (#433972,
+	Guilherme Polo)
+
 2007-04-30  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_opacity):
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 5e38ec980e..d0b441960e 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -411,7 +411,7 @@ gtk_expander_realize (GtkWidget *widget)
   gdk_window_set_user_data (priv->event_window, widget);
 
   widget->style = gtk_style_attach (widget->style, widget->window);
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+  //gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
 }
 
 static void