diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6fcb948298..fce11e0a79 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -84,6 +84,9 @@ namespace osu.Game
 
         public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
 
+        private InputManager inputManager;
+        public double IdleTime => inputManager?.IdleTime ?? 0;
+
         public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         private OsuScreen screenStack;
@@ -113,7 +116,7 @@ namespace osu.Game
 
             forwardLoggedErrorsToNotifications();
 
-            RavenLogger = new RavenLogger(this);
+            RavenLogger = new RavenLogger(this);            
         }
 
         public void ToggleSettings() => settings.ToggleVisibility();
@@ -446,6 +449,7 @@ namespace osu.Game
 
             settings.StateChanged += _ => updateScreenOffset();
             notifications.StateChanged += _ => updateScreenOffset();
+            inputManager = GetContainingInputManager();
         }
 
         private void forwardLoggedErrorsToNotifications()
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index b9a799328e..9a21df04d0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -266,8 +266,8 @@ namespace osu.Game.Screens.Menu
 
         protected override void Update()
         {
-            //if (OsuGame.IdleTime > 6000 && State != MenuState.Exit)
-            //    State = MenuState.Initial;
+            if (game.IdleTime > 6000 && State != ButtonSystemState.Exit)
+                State = ButtonSystemState.Initial;
 
             base.Update();