diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index f73b0ca335..6b9d91d344 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -199,6 +199,9 @@
       <menuitem action='editor-copy'/>
       <menuitem action='editor-paste'/>
       <separator/>
+      <menuitem action='cut-paste-section'/>
+      <menuitem action='copy-paste-section'/>
+      <separator/>
       <menu action="SelectMenu">
         <menuitem action='select-all-objects'/>
         <menuitem action='select-all-tracks'/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fc53951e09..3cbaf81322 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1966,10 +1966,6 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 	edit_items.push_back (MenuElem (_("Crop Region to Range"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)));
 	edit_items.push_back (MenuElem (_("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), false)));
 
-	edit_items.push_back (SeparatorElem());
-	edit_items.push_back (MenuElem (_("Copy/Paste Range Section to Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::cut_copy_section), true)));
-	edit_items.push_back (MenuElem (_("Cut/Paste Range Section to Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::cut_copy_section), false)));
-
 	edit_items.push_back (SeparatorElem());
 	edit_items.push_back (MenuElem (_("Consolidate"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), ReplaceRange, false)));
 	edit_items.push_back (MenuElem (_("Consolidate (with processing)"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), ReplaceRange, true)));
@@ -2052,17 +2048,6 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 	}
 	edit_items.push_back (MenuElem (_("Insert Existing Media"), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
 
-	/* Cut/Copy Section */
-
-	timepos_t unused;
-	bool have_time_selection = get_selection_extents (unused, unused);
-	edit_items.push_back (SeparatorElem());
-	edit_items.push_back (MenuElem (_("Copy/Paste Range Section to Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::cut_copy_section), true)));
-	edit_items.back ().set_sensitive (have_time_selection);
-	edit_items.push_back (MenuElem (_("Cut/Paste Range Section to Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::cut_copy_section), false)));
-	edit_items.back ().set_sensitive (have_time_selection);
-
-
 	/* Nudge track */
 
 	Menu *nudge_menu = manage (new Menu());
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index b9a7ae5893..227065bc4b 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -2021,8 +2021,12 @@ Editor::update_selection_markers ()
 	if (get_selection_extents (start, end)) {
 		_selection_marker.set_position (start, end);
 		_selection_marker.show ();
+		ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (true);
+		ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (true);
 	} else {
 		_selection_marker.hide ();
+		ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (false);
+		ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (false);
 	}
 }