diff --git a/osu-framework b/osu-framework
index cc013fc406..8c16e6244d 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit cc013fc4063dda0843f38c1c73568a413abcf229
+Subproject commit 8c16e6244d8ca884a743a0d5a1f1ee485f18655c
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 76ee4a607e..4a27c7f1ea 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -13,6 +13,8 @@ using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Menu;
+using osu.Framework.Input;
+using OpenTK.Input;
 
 namespace osu.Game.Screens
 {
@@ -73,6 +75,20 @@ namespace osu.Game.Screens
             sampleExit = audio.Sample.Get(@"UI/screen-back");
         }
 
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat || !IsCurrentScreen) return false;
+
+            switch (args.Key)
+            {
+                case Key.Escape:
+                    Exit();
+                    return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+
         protected override void OnResuming(Screen last)
         {
             base.OnResuming(last);