diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9c852a189a..2bc32794d7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -440,12 +440,16 @@ namespace osu.Game
 
         private void screenAdded(Screen newScreen)
         {
+            currentScreen = (OsuScreen)newScreen;
+
             newScreen.ModePushed += screenAdded;
             newScreen.Exited += screenRemoved;
         }
 
         private void screenRemoved(Screen newScreen)
         {
+            currentScreen = (OsuScreen)newScreen;
+
             if (newScreen == null)
                 Exit();
         }