diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in
index 83c7af61d4..e301e51cd1 100644
--- a/gtk2_ardour/ardour.keys.in
+++ b/gtk2_ardour/ardour.keys.in
@@ -395,7 +395,7 @@ This mode provides many different operations on both regions and control points,
 @eep|Editor/cycle-edit-mode|                             1|cycle edit mode {slide, lock, ripple}
 @eep|Editor/cycle-edit-point|                            2|next EP w/o marker {playhead, mouse}
 @eep|Editor/cycle-edit-point-with-marker|     <@PRIMARY@>2|next EP w/marker {playhead, mouse, marker}
-@emmode|Editing/set-mouse-mode-object-range|              3|Smart Mode (provide some Range tools in Object mode)
+@emmode|Editor/set-mouse-mode-object-range|              3|Smart Mode (provide some Range tools in Object mode)
 @gmode|Transport/ToggleFollowEdits|           <@PRIMARY@>3|toggle playhead follows edits
 @grid|Editor/cycle-snap-mode|                            4|cycle to next snap mode {On/Off}
 @grid|Editor/prev-grid-choice|                           5|use prev grid unit
diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc
index 13bfdf77d3..9cbb6d37f9 100644
--- a/gtk2_ardour/editing_context.cc
+++ b/gtk2_ardour/editing_context.cc
@@ -3226,7 +3226,7 @@ EditingContext::load_shared_bindings ()
 	register_common_actions (shared_bindings);
 
 	/* Give this editing context the chance to add more mode mode actions */
-	add_mouse_mode_actions (_common_actions);
+	add_mouse_mode_actions ();
 
 	/* Attach bindings to the canvas for this editing context */
 
diff --git a/gtk2_ardour/editing_context.h b/gtk2_ardour/editing_context.h
index d7c183b158..b9f2f37450 100644
--- a/gtk2_ardour/editing_context.h
+++ b/gtk2_ardour/editing_context.h
@@ -686,7 +686,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
 
 	Glib::RefPtr<Gtk::Action> get_mouse_mode_action (Editing::MouseMode m) const;
 	void bind_mouse_mode_buttons ();
-	virtual void add_mouse_mode_actions (Glib::RefPtr<Gtk::ActionGroup>) {}
+	virtual void add_mouse_mode_actions () {}
 
 	Gtk::HBox snap_box;
 	Gtk::HBox grid_box;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a1c9836332..76498441a0 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1763,7 +1763,7 @@ private:
 	ArdourWidgets::ArdourButton smart_mode_button;
 	Glib::RefPtr<Gtk::ToggleAction> smart_mode_action;
 
-	void add_mouse_mode_actions (Glib::RefPtr<Gtk::ActionGroup>);
+	void add_mouse_mode_actions ();
 
 	void                     mouse_mode_toggled (Editing::MouseMode m);
 	void			 mouse_mode_object_range_toggled ();
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index ce8b94f936..d5a921c8c7 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -680,6 +680,12 @@ Editor::register_actions ()
 
 	/* MIDI stuff */
 	reg_sens (editor_actions, "quantize", _("Quantize"), sigc::mem_fun (*this, &Editor::quantize_region));
+
+	act = ActionManager::register_toggle_action (editor_actions, "set-mouse-mode-object-range", _("Smart Mode"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));
+	smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act);
+	smart_mode_button.set_related_action (smart_mode_action);
+	smart_mode_button.set_text (_("Smart"));
+	smart_mode_button.set_name ("mouse mode button");
 }
 
 static void _lua_print (std::string s) {
@@ -1328,13 +1334,6 @@ Editor::register_region_actions ()
 }
 
 void
-Editor::add_mouse_mode_actions (Glib::RefPtr<ActionGroup> action_group)
+Editor::add_mouse_mode_actions ()
 {
-	RefPtr<Action> act;
-
-	act = ActionManager::register_toggle_action (action_group, "set-mouse-mode-object-range", _("Smart Mode"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));
-	smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act);
-	smart_mode_button.set_related_action (smart_mode_action);
-	smart_mode_button.set_text (_("Smart"));
-	smart_mode_button.set_name ("mouse mode button");
 }