diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index a7290cbbde..53c908a53f 100644
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -589,6 +589,8 @@ class ThemedGenButton(GenButton):
             state = 0
         else:
             state = wx.CONTROL_PRESSED
+        if not self.IsEnabled():
+            state = wx.CONTROL_DISABLED
         wx.RendererNative.Get().DrawPushButton(self, dc, rect, state)
  
 class ThemedGenBitmapButton(ThemedGenButton, GenBitmapButton):