diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index b923957273..b5c162ab11 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     BackgroundFlow.Add(new RowBackground(group)
                     {
-                        Selected = ReferenceEquals(group, selectedGroup?.Value),
                         Action = () =>
                         {
                             selectedGroup.Value = group;
@@ -55,6 +54,8 @@ namespace osu.Game.Screens.Edit.Timing
 
                 Columns = createHeaders();
                 Content = value.Select(createContent).ToArray().ToRectangular();
+
+                updateSelectedGroup();
             }
         }
 
@@ -65,11 +66,17 @@ namespace osu.Game.Screens.Edit.Timing
             selectedGroup.BindValueChanged(group =>
             {
                 // TODO: This should scroll the selected row into view.
-                foreach (var b in BackgroundFlow)
-                    b.Selected = ReferenceEquals(b.Item, group.NewValue);
+                updateSelectedGroup();
             }, true);
         }
 
+        private void updateSelectedGroup()
+        {
+            // TODO: This should scroll the selected row into view.
+            foreach (var b in BackgroundFlow)
+                b.Selected = ReferenceEquals(b.Item, selectedGroup?.Value);
+        }
+
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>