diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 555ac97b0b..21240160c3 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3433,16 +3433,21 @@ bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
     }
 #endif // wxUSE_MENUS_NATIVE
 
-#if wxUSE_CONTROLS
-    wxWindow *item = FindItem(id);
-    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
-    {
-        return ((wxControl *)item)->MSWOnDraw(itemStruct);
-    }
-#endif // wxUSE_CONTROLS
-
 #endif // USE_OWNER_DRAWN
 
+#if wxUSE_CONTROLS
+
+    wxWindow *item = FindItem(id);
+#if wxUSE_OWNER_DRAWN
+    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+        return ((wxControl *)item)->MSWOnDraw(itemStruct);
+#else
+    if ( item && item->IsKindOf(CLASSINFO(wxButton)) )
+        return ((wxButton *)item)->MSWOnDraw(itemStruct);
+#endif // USE_OWNER_DRAWN
+
+#endif // wxUSE_CONTROLS
+
     return FALSE;
 }