diff --git a/ChangeLog b/ChangeLog
index 3f81f71d43..58f648a327 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18  Cody Russell  <cody@jhu.edu>
+
+	* modules/engines/ms-windows/msw_style.c: Draw focus rect for
+	buttons with relief set to GTK_RELIEF_NONE. (#487954)
+
 2007-10-17  Cody Russell  <cody@jhu.edu>
 
 	* gdk/win32/gdkevents-win32.c
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 97ddbf6e02..eafc2c0727 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -3224,11 +3224,7 @@ draw_focus ( GtkStyle      *style,
     if( !GTK_WIDGET_CAN_FOCUS(widget) ) {
         return;
     }
-    if( detail && 0 == strcmp(detail, "button") 
-        && GTK_RELIEF_NONE == gtk_button_get_relief( GTK_BUTTON(widget) ) )
-    {
-        return;
-    }
+
     if ( is_combo_box_child(widget) 
         && (GTK_IS_ARROW(widget) || GTK_IS_BUTTON(widget)) ) {
         return;