diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc
index 8ef47fb663..254b7af693 100644
--- a/gtk2_ardour/trigger_master.cc
+++ b/gtk2_ardour/trigger_master.cc
@@ -612,13 +612,10 @@ CueMaster::event_handler (GdkEvent* ev)
 	switch (ev->type) {
 		case GDK_BUTTON_PRESS:
 			if (ev->button.button == 1) {
-				/* stop all running triggers, but let them run
-				   to their natural end
-				*/
 				if (Keyboard::modifier_state_equals (ev->button.state, Keyboard::PrimaryModifier)) {
-					_session->stop_all_triggers (true);
+					_session->stop_all_triggers (true);  //stop 'now'
 				} else {
-					_session->stop_all_triggers (false);
+					_session->stop_all_triggers (false);  //stop quantized (bar end)
 				}
 				return true;
 			}
diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index 7832bd7cbc..46f9d1af42 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -39,6 +39,7 @@
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
+#include "keyboard.h"
 #include "public_editor.h"
 #include "region_view.h"
 #include "selection.h"
@@ -644,7 +645,11 @@ TriggerBoxUI::play_button_event (GdkEvent* ev, uint64_t n)
 		switch (ev->type) {
 			case GDK_BUTTON_PRESS:
 				if (ev->button.button == 1) {
-					_triggerbox.stop_all_immediately ();
+					if (Keyboard::modifier_state_equals (ev->button.state, Keyboard::PrimaryModifier)) {
+						_triggerbox.stop_all_immediately ();
+					} else {
+						_triggerbox.stop_all_quantized ();
+					}
 					return true;
 				}
 				break;