diff --git a/modules/juce_gui_basics/buttons/juce_Button.cpp b/modules/juce_gui_basics/buttons/juce_Button.cpp
index 102e50c318..70ba77b3ee 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.cpp
+++ b/modules/juce_gui_basics/buttons/juce_Button.cpp
@@ -171,7 +171,7 @@ void Button::setToggleState (bool shouldBeOn, NotificationType notification)
 
 void Button::setToggleState (bool shouldBeOn, NotificationType clickNotification, NotificationType stateNotification)
 {
-    if (shouldBeOn != lastToggleState)
+    if (isEnabled() && shouldBeOn != lastToggleState)
     {
         WeakReference<Component> deletionWatcher (this);