diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e401f3d4d5..c6aaf3fb4f 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3545,13 +3545,16 @@ Editor::zoom_focus_selection_done ()
 	}
 }
 
-gint
+bool
 Editor::edit_controls_button_release (GdkEventButton* ev)
 {
 	if (Keyboard::is_context_menu_event (ev)) {
 		ARDOUR_UI::instance()->add_route (this);
+	} else if (ev->button == 1) {
+		selection->clear_tracks ();
 	}
-	return TRUE;
+	
+	return true;
 }
 
 gint
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 80f3f6182a..20e8ef02be 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -960,7 +960,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	bool track_canvas_map_handler (GdkEventAny*);
 
-	gint edit_controls_button_release (GdkEventButton*);
+	bool edit_controls_button_release (GdkEventButton*);
 	Gtk::Menu *edit_controls_left_menu;
 	Gtk::Menu *edit_controls_right_menu;