diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index b7c39f888f..12ca73ca95 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -906,6 +906,12 @@ AutomationLine::set_selected_points (PointSelection const & points)
 		(*i)->set_selected (true);
 	}
 
+	if (points.empty()) {
+		remove_visibility (SelectedControlPoints);
+	} else {
+		add_visibility (SelectedControlPoints);
+	}
+
 	set_colors ();
 }