diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index cd33425ee5..05e45014eb 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
 
@@ -20,11 +21,9 @@ namespace osu.Game.Screens.Edit.Timing
             });
         }
 
-        protected override void LoadComplete()
+        protected override void OnControlPointChanged(ValueChangedEvent<DifficultyControlPoint> point)
         {
-            base.LoadComplete();
-
-            ControlPoint.BindValueChanged(point => { multiplier.Text = $"Multiplier: {point.NewValue?.SpeedMultiplier:0.##}x"; });
+            multiplier.Text = $"Multiplier: {point.NewValue?.SpeedMultiplier:0.##}x";
         }
 
         protected override DifficultyControlPoint CreatePoint()
diff --git a/osu.Game/Screens/Edit/Timing/EffectSection.cs b/osu.Game/Screens/Edit/Timing/EffectSection.cs
index bafdfd0b0d..2b37ffaaaf 100644
--- a/osu.Game/Screens/Edit/Timing/EffectSection.cs
+++ b/osu.Game/Screens/Edit/Timing/EffectSection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
 
@@ -22,15 +23,10 @@ namespace osu.Game.Screens.Edit.Timing
             });
         }
 
-        protected override void LoadComplete()
+        protected override void OnControlPointChanged(ValueChangedEvent<EffectControlPoint> point)
         {
-            base.LoadComplete();
-
-            ControlPoint.BindValueChanged(point =>
-            {
-                kiai.Text = $"Kiai: {(point.NewValue?.KiaiMode == true ? "on" : "off")}";
-                omitBarLine.Text = $"Skip Bar Line: {(point.NewValue?.OmitFirstBarLine == true ? "on" : "off")}";
-            });
+            kiai.Text = $"Kiai: {(point.NewValue?.KiaiMode == true ? "on" : "off")}";
+            omitBarLine.Text = $"Skip Bar Line: {(point.NewValue?.OmitFirstBarLine == true ? "on" : "off")}";
         }
 
         protected override EffectControlPoint CreatePoint()
diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
index e665db0a4d..1bedb1ff42 100644
--- a/osu.Game/Screens/Edit/Timing/SampleSection.cs
+++ b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
 
@@ -22,15 +23,10 @@ namespace osu.Game.Screens.Edit.Timing
             });
         }
 
-        protected override void LoadComplete()
+        protected override void OnControlPointChanged(ValueChangedEvent<SampleControlPoint> point)
         {
-            base.LoadComplete();
-
-            ControlPoint.BindValueChanged(point =>
-            {
-                bank.Text = $"Bank: {point.NewValue?.SampleBank}";
-                volume.Text = $"Volume: {point.NewValue?.SampleVolume}%";
-            });
+            bank.Text = $"Bank: {point.NewValue?.SampleBank}";
+            volume.Text = $"Volume: {point.NewValue?.SampleVolume}%";
         }
 
         protected override SampleControlPoint CreatePoint()
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index c6140ff497..ccf1582486 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -119,8 +119,12 @@ namespace osu.Game.Screens.Edit.Timing
                 ControlPoint.Value = points.NewValue?.ControlPoints.OfType<T>().FirstOrDefault();
                 checkbox.Current.Value = ControlPoint.Value != null;
             }, true);
+
+            ControlPoint.BindValueChanged(OnControlPointChanged, true);
         }
 
+        protected abstract void OnControlPointChanged(ValueChangedEvent<T> point);
+
         protected abstract T CreatePoint();
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 8609da4c4d..15007ffdb3 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
 
@@ -22,15 +23,10 @@ namespace osu.Game.Screens.Edit.Timing
             });
         }
 
-        protected override void LoadComplete()
+        protected override void OnControlPointChanged(ValueChangedEvent<TimingControlPoint> point)
         {
-            base.LoadComplete();
-
-            ControlPoint.BindValueChanged(point =>
-            {
-                bpm.Text = $"BPM: {point.NewValue?.BPM:0.##}";
-                timeSignature.Text = $"Signature: {point.NewValue?.TimeSignature}";
-            });
+            bpm.Text = $"BPM: {point.NewValue?.BPM:0.##}";
+            timeSignature.Text = $"Signature: {point.NewValue?.TimeSignature}";
         }
 
         protected override TimingControlPoint CreatePoint()