diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 2b50dc9a6c..9b3fbe3d5e 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2302,12 +2302,15 @@ Editor::set_snap_mode (SnapMode mode)
 void
 Editor::set_edit_point_preference (EditPoint ep, bool force)
 {
+	if (Profile->get_mixbus()) {
+		if (ep == EditAtSelectedMarker) {
+			ep = EditAtPlayhead;
+		}
+	}
+
 	bool changed = (_edit_point != ep);
 
 	_edit_point = ep;
-	if (Profile->get_mixbus())
-		if (ep == EditAtSelectedMarker)
-			ep = EditAtPlayhead;
 
 	string str = edit_point_strings[(int)ep];
 	if (str != edit_point_selector.get_text ()) {