diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 8765dae384..a290cce708 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Edit
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
             {
-                hoveredBackground.Colour = colourHover = colours.Background1;
+                colourHover = colours.Background1;
                 colourSelected = colours.Colour3;
             }
 
@@ -105,8 +105,7 @@ namespace osu.Game.Screens.Edit
             {
                 base.LoadComplete();
 
-                // Reduce flicker of rows when offset is being changed rapidly.
-                // Probably need to reconsider this.
+                updateState();
                 FinishTransforms(true);
             }
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 88c738c1d2..6d46b429f0 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     BackgroundFlow.Add(new RowBackground(group)
                     {
+                        Selected = group.Equals(selectedGroup?.Value),
                         Action = () =>
                         {
                             selectedGroup.Value = group;