diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index e915256fa4..a00cd24aff 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2379,7 +2379,7 @@ Editor::add_location_mark_with_flag (timepos_t const & where, Location::Flags fl
 	if (!choose_new_marker_name (markername)) {
 		return;
 	}
-	Location *location = new Location (*_session, where, where, markername, flags);
+	Location *location = new Location (*_session, where, where, markername, flags, cue_id);
 	begin_reversible_command (_("add marker"));
 
 	XMLNode &before = _session->locations()->get_state();
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 0696bb5f3f..a51e35f792 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -293,9 +293,9 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t)
 		Gtk::MenuItem& cue_submenu = add_items.back();
 		Gtk::Menu* cue_menu = new Gtk::Menu;
 		MenuList& cue_items = cue_menu->items();
-		cue_items.push_back (MenuElem (_("Stop All Cues"), sigc::bind (sigc::mem_fun (*this, &Editor::add_location_mark_with_flag), where, Location::IsCueMarker, CueRecord::stop_all)));
+		cue_items.push_back (MenuElem (_("Stop All Cues"), sigc::bind (sigc::mem_fun (*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark |Location::IsCueMarker), CueRecord::stop_all)));
 		for (int32_t n = 0; n < TriggerBox::default_triggers_per_box; ++n) {
-			cue_items.push_back (MenuElem (string_compose (_("Cue %1"), cue_marker_name (n)), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::IsCueMarker, n)));
+			cue_items.push_back (MenuElem (string_compose (_("Cue %1"), cue_marker_name (n)), sigc::bind (sigc::mem_fun(*this, &Editor::add_location_mark_with_flag), where, Location::Flags(Location::IsMark |Location::IsCueMarker), n)));
 		}
 		cue_submenu.set_submenu (*cue_menu);