diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d13e8ffa57..b7c4edd9d2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -10,11 +10,14 @@ using osu.Framework.OS;
 using osu.Game.Graphics.Background;
 using osu.Game.GameModes.Play;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 
 namespace osu.Game
 {
     public class OsuGame : OsuGameBase
     {
+        public Toolbar Toolbar;
+
         public override void SetHost(BasicGameHost host)
         {
             base.SetHost(host);
@@ -33,7 +36,8 @@ namespace osu.Game
                         new Background()
                     }
                 },
-                new MainMenu()
+                new MainMenu(),
+                Toolbar = new Toolbar(),
             });
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d2e95d38d9..3eeebfc29a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -20,8 +20,6 @@ namespace osu.Game
 
         public Options Options;
         public APIAccess API;
-        public Toolbar Toolbar;
-
 
         protected override Container AddTarget => ratioContainer?.IsLoaded == true ? ratioContainer : base.AddTarget;
 
@@ -50,7 +48,6 @@ namespace osu.Game
                 {
                     Children = new Drawable[]
                     {
-                        Toolbar = new Toolbar(),
                         Options = new Options(),
                         new OsuCursorContainer()
                     }