diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f1b1948b5e..64f2648ca1 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Edit
             }
 
             var layerBelowRuleset = CreateLayerContainer();
-            layerBelowRuleset.Child = new BorderLayer { RelativeSizeAxes = Axes.Both };
+            layerBelowRuleset.Child = new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both };
 
             var layerAboveRuleset = CreateLayerContainer();
             layerAboveRuleset.Child = new BlueprintContainer();
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/BorderLayer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/BorderLayer.cs
deleted file mode 100644
index c46f9a1b7f..0000000000
--- a/osu.Game/Screens/Edit/Screens/Compose/Layers/BorderLayer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using OpenTK.Graphics;
-
-namespace osu.Game.Screens.Edit.Screens.Compose.Layers
-{
-    public class BorderLayer : Container
-    {
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
-
-        public BorderLayer()
-        {
-            InternalChildren = new Drawable[]
-            {
-                new Container
-                {
-                    Name = "Border",
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    BorderColour = Color4.White,
-                    BorderThickness = 2,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        AlwaysPresent = true
-                    }
-                },
-                content = new Container { RelativeSizeAxes = Axes.Both }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/EditorPlayfieldBorder.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/EditorPlayfieldBorder.cs
new file mode 100644
index 0000000000..22cdfa9328
--- /dev/null
+++ b/osu.Game/Screens/Edit/Screens/Compose/Layers/EditorPlayfieldBorder.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using OpenTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Layers
+{
+    /// <summary>
+    /// Provides a border around the playfield.
+    /// </summary>
+    public class EditorPlayfieldBorder : CompositeDrawable
+    {
+        public EditorPlayfieldBorder()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Masking = true;
+            BorderColour = Color4.White;
+            BorderThickness = 2;
+
+            InternalChild = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Alpha = 0,
+                AlwaysPresent = true
+            };
+        }
+    }
+}