diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h
index 4bd68926c2..c3eeb657b2 100644
--- a/libs/ardour/ardour/triggerbox.h
+++ b/libs/ardour/ardour/triggerbox.h
@@ -415,7 +415,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
 	void get_ui_state (UIState &state) const;
 	void set_ui_state (UIState &state);
 
-	static PBD::Signal3<void,PBD::PropertyChange,int,int> TriggerPropertyChange;
+	static PBD::Signal2<void,PBD::PropertyChange,Trigger*> TriggerPropertyChange;
 
   protected:
 	struct UIRequests {
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index d9661c2371..6b44bdd96e 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -202,7 +202,7 @@ FollowAction::to_string () const
 
 
 Trigger * const Trigger::MagicClearPointerValue = (Trigger*) 0xfeedface;
-PBD::Signal3<void,PropertyChange,int,int> Trigger::TriggerPropertyChange;
+PBD::Signal2<void,PropertyChange,Trigger*> Trigger::TriggerPropertyChange;
 
 Trigger::Trigger (uint32_t n, TriggerBox& b)
 	: _launch_style (Properties::launch_style, OneShot)
@@ -423,7 +423,7 @@ Trigger::send_property_change (PropertyChange pc)
 
 	PropertyChanged (pc);
 	/* emit static signal for global observers */
-	TriggerPropertyChange (pc, _box.order(), _index);
+	TriggerPropertyChange (pc, this);
 }
 
 void