diff --git a/ChangeLog b/ChangeLog
index 60ee4dfb4c..7c7adff900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-03  Tor Lillqvist  <tml@novell.com>
+
+	* modules/engines/ms-windows/msw_style.c (draw_box): Check that
+	the widget is a GtkButton before casting.
+
 2008-03-02  Johan Dahlin  <johan@gnome.org>
 
 	* configure.in: Compare using = instead of ==, which is portable.
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index aabf8f8e70..9c11b75bfc 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -2017,8 +2017,8 @@ draw_box (GtkStyle *style,
 	    }
 	}
       else if (is_toolbar_child (widget->parent)
-	       || (GTK_RELIEF_NONE ==
-		   gtk_button_get_relief (GTK_BUTTON (widget))))
+	       || (!GTK_IS_BUTTON (widget) ||
+		   (GTK_RELIEF_NONE == gtk_button_get_relief (GTK_BUTTON (widget)))))
 	{
 	  if (draw_tool_button (window, widget, style, x, y,
 				width, height, state_type, area))