diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 3e9cd41698..42f1a80f0b 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -869,6 +869,11 @@ Selection::set (list<Selectable*> const & selectables)
 {
 	clear_regions();
 	clear_points ();
+
+	if (Config->get_link_region_and_track_selection ()) {
+		clear_tracks ();
+	}
+	
 	add (selectables);
 }