diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 9b51920b32..3fe9bb9ea5 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -54,9 +54,6 @@
     <menu name='Transport' action='Transport'>
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
-#if 0
-        <menuitem action='toggle-stationary-playhead'/>
-#endif
         <menuitem action='PlaySelection'/>
         <menuitem action='PlayPreroll'/>
         <menuitem action='ToggleRollMaybe'/>
@@ -149,6 +146,7 @@
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='toggle-stationary-playhead'/>
       <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
      <separator/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fe5e1a6b98..e5aa60d9ab 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5688,13 +5688,14 @@ Editor::super_rapid_screen_update ()
 
 		} else {
 
-			framepos_t const frame = playhead_cursor->current_frame ();
-			double target = ((double)frame - (double)current_page_samples()/3.0);
-			if (target <= 0.0) {
-				target = 0.0;
+			if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0 && !pending_visual_change.being_handled) {
+				framepos_t const frame = playhead_cursor->current_frame ();
+				double target = ((double)frame - (double)current_page_samples()/3.0);
+				if (target <= 0.0) {
+					target = 0.0;
+				}
+				reset_x_origin (target);
 			}
-			reset_x_origin (target);
-
 
 		}