diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 172f71d4a7..881be020a9 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -346,7 +346,10 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 		break;
 		
 	case StreamItem:
-		// commit = set_selected_track_from_click (press, op, true);
+		if (event->button.button == 3) {
+			/* for context click, select track */
+			commit = set_selected_track_from_click (press, op, true);
+		}
 		break;
 		    
 	case AutomationTrackItem: