diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs
index 37a85f7f75..bdabb8d8dd 100644
--- a/osu.Game/GameModes/Play/PlaySongSelect.cs
+++ b/osu.Game/GameModes/Play/PlaySongSelect.cs
@@ -33,6 +33,25 @@ namespace osu.Game.GameModes.Play
             foreach (var beatmapSet in sets)
                 setList.Add(createSetUI(beatmapSet));
         }
+        
+        public PlaySongSelect()
+        {
+            Children = new[]
+            {
+                new ScrollContainer
+                {
+                    OriginPosition = new OpenTK.Vector2(0, -(Game as OsuGame).Toolbar.Height),
+                    Children = new[]
+                    {
+                        setList = new FlowContainer
+                        {
+                            Direction = FlowDirection.VerticalOnly,
+                            Padding = new OpenTK.Vector2(25, 25)
+                        }
+                    }
+                }
+            };
+        }
 
         public override void Load(BaseGame game)
         {
@@ -43,19 +62,6 @@ namespace osu.Game.GameModes.Play
             playMode = osu.PlayMode;
             playMode.ValueChanged += PlayMode_ValueChanged;
 
-            Add(new ScrollContainer
-            {
-                OriginPosition = new OpenTK.Vector2(0, -osu.Toolbar.Height),
-                Children = new[]
-                {
-                    setList = new FlowContainer
-                    {
-                        Direction = FlowDirection.VerticalOnly,
-                        Padding = new OpenTK.Vector2(25, 25)
-                    }
-                }
-            });
-
             addBeatmapSets();
 
             (Game as OsuGame).Beatmaps.BeatmapSetAdded += bset => setList.Add(createSetUI(bset));