diff --git a/modules/juce_gui_basics/buttons/juce_Button.cpp b/modules/juce_gui_basics/buttons/juce_Button.cpp
index 1b981220ae..344621692a 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.cpp
+++ b/modules/juce_gui_basics/buttons/juce_Button.cpp
@@ -308,7 +308,7 @@ void Button::triggerClick()
 void Button::internalClickCallback (const ModifierKeys& modifiers)
 {
     if (clickTogglesState)
-        setToggleState ((radioGroupId != 0) || ! lastToggleState, dontSendNotification);
+        setToggleState (radioGroupId != 0 || ! lastToggleState, sendNotification);
 
     sendClickMessage (modifiers);
 }
diff --git a/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp b/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
index 74b7e1248d..23225cf81d 100644
--- a/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
+++ b/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
@@ -214,7 +214,8 @@ Drawable* DrawableButton::getOverImage() const noexcept
 
 Drawable* DrawableButton::getDownImage() const noexcept
 {
-    Drawable* const d = getToggleState() ? downImageOn : downImage;
+    if (Drawable* const d = getToggleState() ? downImageOn : downImage)
+        return d;
 
-    return d != nullptr ? d : getOverImage();
+    return getOverImage();
 }