diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 12ca73ca95..7b84e686f0 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -177,7 +177,11 @@ AutomationLine::update_visibility ()
 	} else {
 		line->hide ();
 		for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-			(*i)->hide ();
+			if (_visible & ControlPoints) {
+				(*i)->show ();
+			} else {
+				(*i)->hide ();
+			}
 		}
 	}