diff --git a/ChangeLog b/ChangeLog
index 52906a53e3..a62cd1d84e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-16  Xan Lopez  <xan@gnome.org>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_expose_event): Cleanup the logic
+	in expose event handler. Reviewed by Matthias Clasen, #406112
+
 2007-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmain.c: Run pre_parse_hook only once.  (#403139, Kjartan
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 9fa730efd2..f6fdb965d3 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2276,19 +2276,14 @@ gtk_combo_box_expose_event (GtkWidget      *widget,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
 
-  if (!combo_box->priv->tree_view)
-    {
-      gtk_container_propagate_expose (GTK_CONTAINER (widget),
-				      combo_box->priv->button, event);
-    }
-  else
-    {
-      gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                      combo_box->priv->button, event);
+  gtk_container_propagate_expose (GTK_CONTAINER (widget),
+				  combo_box->priv->button, event);
 
-      if (combo_box->priv->cell_view_frame)
-        gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                        combo_box->priv->cell_view_frame, event);
+  if (combo_box->priv->tree_view &&
+      combo_box->priv->cell_view_frame)
+    {
+      gtk_container_propagate_expose (GTK_CONTAINER (widget),
+				      combo_box->priv->cell_view_frame, event);
     }
 
   gtk_container_propagate_expose (GTK_CONTAINER (widget),