diff --git a/gtk2_ardour/automation_selectable.h b/gtk2_ardour/automation_selectable.h
index 62ebd08aa2..2d5c6fc4b3 100644
--- a/gtk2_ardour/automation_selectable.h
+++ b/gtk2_ardour/automation_selectable.h
@@ -24,7 +24,7 @@
 
 class TimeAxisView;
 
-/** A selected automation point, expressed as a rectangle.
+/** One or more selected automation points, expressed as a rectangle.
  *
  *  x coordinates start/end are in AutomationList model coordinates.
  *  y coordinates are a expressed as a fraction of the AutomationTimeAxisView's height, where 0 is the
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 11de83c6a0..6a3eaa9084 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1070,6 +1070,8 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 		return true;
 	}
 
+	button_selection (item, event, item_type);
+
 	if (!_drags->active () &&
 	    (Keyboard::is_delete_event (&event->button) ||
 	     Keyboard::is_context_menu_event (&event->button) ||
@@ -1124,8 +1126,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 		were_dragging = true;
 	}
 
-	button_selection (item, event, item_type);
-
 	/* edit events get handled here */
 
 	if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {