diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index a7ccc62e40..1d5d2f9431 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -20,6 +20,7 @@ using osu.Game.Skinning;
 using osu.Framework.Allocation;
 using osu.Game.Configuration;
 using osu.Framework.Bindables;
+using osu.Game.Screens;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -36,12 +37,10 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
-
         private Bindable<bool> showPlayfieldBorder;
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
 
-
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
@@ -87,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private void load(OsuConfigManager config)
         {
             showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
+
             if (showPlayfieldBorder.Value)
             {
                 AddInternal(new PlayfieldBorder
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 755f4e990c..e8a07fc831 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -76,14 +76,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",
-                    Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
+                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
                     Keywords = new[] { "scoring" }
                 },
                 new SettingsCheckbox
                 {
                     LabelText = "Show playfield border",
-                    Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder)
-                    Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder),
                 },
             };
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index fc80d4f3df..f4457c6aeb 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
                         drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
                         {
                             LayerBelowRuleset,
-                            new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
+                            new PlayfieldBorder { RelativeSizeAxes = Axes.Both }
                         }),
                         drawableRulesetWrapper,
                         // layers above playfield