diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index d705189cdf..a263a4e1f7 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -191,6 +191,8 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
 		return;
 	}
 
+	PBD::Unwinder<bool> uw (_track_selection_change_without_scroll, true);
+
 	RouteGroup* group = NULL;
 	if (clicked_routeview) {
 		group = clicked_routeview->route()->route_group();