diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index a3d5170834..f5b6cc80f8 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -385,10 +385,11 @@
       <separator/>
       <menuitem action='loop-region'/>
       <menuitem action='rename-region'/>
-      <menuitem action='show-region-properties'/>
       <menuitem action='loudness-analyze-region'/>
       <menuitem action='spectral-analyze-region'/>
       <menu action='RegionMenuEdit'>
+        <menuitem action='edit-region-dedicated-window'/>
+        <separator/>
 #ifndef MIXBUS
         <menuitem action='combine-regions'/>
         <menuitem action='uncombine-regions'/>
@@ -925,8 +926,7 @@
     <separator/>
     <menuitem action='loop-region'/>
     <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menuitem action='edit-region-pianoroll-window'/>
+    <menuitem action='edit-region-dedicated-window'/>
     <menu action='RegionMenuEdit'>
       <menuitem action='combine-regions'/>
       <menuitem action='uncombine-regions'/>
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index e588e03b44..248d21c1bc 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -229,7 +229,7 @@ public:
 
 	bool extend_selection_to_track (TimeAxisView&);
 
-	void edit_region_in_pianoroll_window ();
+	void edit_region_in_dedicated_window ();
 	void maybe_edit_region_in_bottom_pane (RegionView&);
 
 	void play_selection ();
@@ -1156,7 +1156,6 @@ private:
 	void remove_selected_regions ();
 	void remove_regions (const RegionSelection&, bool can_ripple, bool as_part_of_other_command);
 	void remove_clicked_region ();
-	void show_region_properties ();
 	void show_midi_list_editor ();
 	void rename_region ();
 	void duplicate_some_regions (RegionSelection&, float times);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index f1d0409618..f135f9e6db 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1417,11 +1417,8 @@ Editor::register_region_actions ()
 	/* Open the list editor dialogue for the selected regions */
 	register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "show-region-list-editor", _("List Editor..."), sigc::mem_fun (*this, &Editor::show_midi_list_editor));
 
-	/* Open the region properties dialogue for the selected regions */
-	register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "show-region-properties", _("Properties..."), sigc::mem_fun (*this, &Editor::show_region_properties));
-
 	/* Edit the region in a separate region pianoroll window */
-	register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "edit-region-pianoroll-window", _("Edit in separate window..."), sigc::mem_fun (*this, &Editor::edit_region_in_pianoroll_window));
+	register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "edit-region-dedicated-window", _("Edit in separate window..."), sigc::mem_fun (*this, &Editor::edit_region_in_dedicated_window));
 
 	register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "play-selected-regions", _("Play Selected Regions"), sigc::mem_fun(*this, &Editor::play_selected_region));
 	register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "tag-selected-regions", _("Tag Selected Regions"), sigc::mem_fun(*this, &Editor::tag_selected_region));
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index cdfd22b5c2..88c729f6d5 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1346,7 +1346,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 	if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {
 		switch (item_type) {
 		case RegionItem:
-			show_region_properties ();
+			edit_region_in_dedicated_window ();
 			break;
 		case TempoMarkerItem: {
 			ArdourMarker* marker;
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 8d66ca0299..7a9ad8ab94 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2757,13 +2757,6 @@ Editor::lower_region_to_bottom ()
 	do_layer_operation (LowerToBottom);
 }
 
-/** Show the region editor for the selected regions */
-void
-Editor::show_region_properties ()
-{
-	selection->foreach_regionview (&RegionView::show_region_editor);
-}
-
 /** Show the midi list editor for the selected MIDI regions */
 void
 Editor::show_midi_list_editor ()
@@ -9520,9 +9513,9 @@ Editor::temporal_zoom_extents ()
 }
 
 void
-Editor::edit_region_in_pianoroll_window ()
+Editor::edit_region_in_dedicated_window ()
 {
-	selection->foreach_midi_regionview (&MidiRegionView::show_region_editor);
+	selection->foreach_regionview (&RegionView::show_region_editor);
 }
 
 void