diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in
index 7afeaacdc5..fcbbcf4038 100644
--- a/gtk2_ardour/ardour.keys.in
+++ b/gtk2_ardour/ardour.keys.in
@@ -118,7 +118,7 @@ This mode provides many different operations on both regions and control points,
 @eep|Editor/edit-cursor-to-previous-region-sync|                   apostrophe|EP to prev region sync
 @eep|Editor/edit-cursor-to-next-region-sync|                        semicolon|EP to next region sync
 
-@trans|Transport/SpacebarAction|                                        space|toggle roll
+@trans|Transport/ToggleRoll|                                            space|toggle roll
 @trans|Transport/PlaySelection|                            <@SECONDARY@>space|play edit range
 @edit|Editor/play-from-edit-point-and-return|    <@PRIMARY@><@TERTIARY@>space|play from EP \& return
 @trans|Transport/ToggleRollMaybe|               <@PRIMARY@><@SECONDARY@>space|stop (keep loop/range play)
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b6d48c9496..06e88eeff8 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1858,9 +1858,8 @@ ARDOUR_UI::get_smart_mode() const
 	return ( editor->get_smart_mode() );
 }
 
-
 void
-ARDOUR_UI::spacebar_action (bool with_abort, bool roll_out_of_bounded_mode)
+ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
 	if (!_session) {
 		return;
@@ -1873,16 +1872,6 @@ ARDOUR_UI::spacebar_action (bool with_abort, bool roll_out_of_bounded_mode)
 		return;
 	}
 
-	toggle_roll (with_abort, roll_out_of_bounded_mode);
-}
-
-void
-ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
-{
-	if (!_session) {
-		return;
-	}
-
 	if (_session->is_auditioning()) {
 		_session->cancel_audition ();
 		return;
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 443b8d08a8..931ba4d058 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -335,10 +335,9 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (transport_actions, X_("SpacebarAction"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::spacebar_action), false, false));
-	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
 	ActionManager::session_sensitive_actions.push_back (act);
+	ActionManager::transport_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (transport_actions, X_("alternate-ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);