diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 4121e1f7bb..c8982b819a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Screens.Edit.Timing
                 };
 
                 controlPoints = group.ControlPoints.GetBoundCopy();
-                controlPoints.CollectionChanged += (_, __) => createChildren();
             }
 
             [Resolved]
@@ -125,6 +124,12 @@ namespace osu.Game.Screens.Edit.Timing
                 createChildren();
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                controlPoints.CollectionChanged += (_, __) => createChildren();
+            }
+
             private void createChildren()
             {
                 fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null);
diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index c77d48ef0a..d76b5e7406 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -111,7 +111,8 @@ namespace osu.Game.Screens.Edit.Timing
             foreach (var cp in currentGroupItems)
                 Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
 
-            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time);
+            // the control point might not necessarily exist yet, if currentGroupItems was empty.
+            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time, true);
 
             changeHandler?.EndChange();
         }