diff --git a/ChangeLog b/ChangeLog
index 3e56d1f751..8bead90bbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-27  Cody Russell  <bratsche@gnome.org>
+
+	Merge from trunk:
+
+        * modules/engines/ms-windows/msw_style.c: Correct draw_box()
+        function to check detail for "notebook".  This fixes a problem
+        where notebooks without visible headers were not styling
+        correctly. (#470033, Daniel Atallah and Cody Russell)
+
 2007-08-16  Cody Russell  <bratsche@gnome.org>
 
 	Merge from trunk:
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 908d96704e..bd63af9490 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -2212,6 +2212,17 @@ draw_box (GtkStyle * style,
                 return;
             }
 	}
+    else if (detail && !strcmp (detail, "notebook") && GTK_IS_NOTEBOOK (widget))
+	{
+	    GtkNotebook *notebook = GTK_NOTEBOOK (widget);
+
+	    if (xp_theme_draw (window, XP_THEME_ELEMENT_TAB_PANE, style,
+			       x, y, width, height, state_type, area))
+		{
+		    return;
+		}
+	}
+
     else
 	{
 	    const gchar *name = gtk_widget_get_name (widget);