diff --git a/src/juce_appframework/gui/components/buttons/juce_Button.cpp b/src/juce_appframework/gui/components/buttons/juce_Button.cpp
index 2414890de6..c0b92f4938 100644
--- a/src/juce_appframework/gui/components/buttons/juce_Button.cpp
+++ b/src/juce_appframework/gui/components/buttons/juce_Button.cpp
@@ -230,7 +230,7 @@ Button::ButtonState Button::updateState (const MouseEvent* const e) throw()
         const bool over = reallyContains (mx, my, true);
         const bool down = isMouseButtonDownAnywhere();
 
-        if ((down && (over || (triggerOnMouseDown && state == buttonDown))) || isKeyDown)
+        if ((down && (over || (triggerOnMouseDown && buttonState == buttonDown))) || isKeyDown)
             state = buttonDown;
         else if (over)
             state = buttonOver;