diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 72144a5983..7547d46627 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5970,7 +5970,7 @@ Editor::super_rapid_screen_update ()
 		return;
 	}
 
-	if (!_pending_locate_request) {
+	if (!_pending_locate_request && !_session->locate_initiated()) {
 		_playhead_cursor->set_position (sample);
 	}