diff --git a/gtk2_ardour/waves_button.cc b/gtk2_ardour/waves_button.cc
index 2be9548c0f..d1e2111700 100644
--- a/gtk2_ardour/waves_button.cc
+++ b/gtk2_ardour/waves_button.cc
@@ -352,10 +352,10 @@ WavesButton::on_button_release_event (GdkEventButton *)
         _pushed = false;
         queue_draw ();
         if (_hovering) {
-            signal_clicked (this);
             if (_toggleable) {
                 set_active_state (active_state () == Gtkmm2ext::ExplicitActive ? Gtkmm2ext::Off : Gtkmm2ext::ExplicitActive);
             }
+            signal_clicked (this);
 
             if (_act_on_release) {
                 if (_action) {