diff --git a/ChangeLog b/ChangeLog
index 5c2a15e780..01ffbb5d6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-19  Cody Russell <bratsche@gnome.org>
+
+	* modules/engines/ms-windows/msw_style.c: Fix menuitem rendering
+	for Windows Vista.  (#392015, Hiroyuki Yamamoto)
+
 2007-04-19  Dominic Lachowicz <domlachowicz@gmail.com>
 
 	* modules/engines/ms-windows/msw_style.c: Fix pixbuf leaks in
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index bb149d86f1..51a9e2e367 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -1717,13 +1717,9 @@ draw_menu_item(GdkWindow* window, GtkWidget* widget, GtkStyle* style,
     HDC dc;
     RECT rect;
 
-    if ( xp_theme_is_active() ) {
-        return xp_theme_draw( window, XP_THEME_ELEMENT_MENU_ITEM, style,
-                              x, y, width, height, state_type, area );
-    }
-
     if( (parent = gtk_widget_get_parent(widget))
-        &&  GTK_IS_MENU_BAR(parent) )
+        && GTK_IS_MENU_BAR(parent)
+        && !xp_theme_is_active() )
     {
         bar = GTK_MENU_SHELL(parent);