diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index ebee195c86..56e88d9744 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -345,9 +345,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 		button_release_can_deselect = false;
 	}
 
+
 	if (op == Selection::Toggle || op == Selection::Set) {
 		
-		get_equivalent_regions (clicked_regionview, all_equivalent_regions);
+		if (selection->selected (clicked_audio_trackview)) {
+			get_equivalent_regions (clicked_regionview, all_equivalent_regions);
+		} else {
+			all_equivalent_regions.push_back (clicked_regionview);
+		}
 		
 		switch (op) {
 		case Selection::Toggle: