diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 1dd525c14ee..c43fb873abf 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2338,6 +2338,11 @@ Editor::can_remove_control_point (ControlPoint& control_point)
 		if (line.is_last_point(control_point) || line.is_first_point(control_point)) {
 			return false;
 		}
+	} else {
+		/* we shouldn't remove the first automation point ... unless it also is the last */
+		if (line.is_first_point(control_point) && ! line.is_last_point(control_point)) {
+			return false;
+		}
 	}
 
 	return true;