diff --git a/osu-framework b/osu-framework
index 6e7fa7ebe5..0ca3fe2b5d 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 6e7fa7ebe564e9bca957ea26ff2bee6038c2bf67
+Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3
diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs
index 32bbff5480..75fec4bdbf 100644
--- a/osu.Game/GameModes/Menu/ButtonSystem.cs
+++ b/osu.Game/GameModes/Menu/ButtonSystem.cs
@@ -181,6 +181,8 @@ namespace osu.Game.GameModes.Menu
 
         MenuState state;
 
+        public override bool HandleInput => state != MenuState.Exit;
+
         public MenuState State
         {
             get
@@ -239,8 +241,6 @@ namespace osu.Game.GameModes.Menu
                             b.State = Button.ButtonState.Expanded;
                         break;
                     case MenuState.Exit:
-                        HandleInput = false;
-
                         buttonArea.FadeOut(200);
 
                         foreach (Button b in buttonsTopLevel)
@@ -587,9 +587,10 @@ namespace osu.Game.GameModes.Menu
                 //box.FlashColour(ColourHelper.Lighten2(colour, 0.7f), 200);
             }
 
+            public override bool HandleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
+
             protected override void Update()
             {
-                HandleInput = state != ButtonState.Exploded && box.Scale.X >= 0.8f;
                 iconText.Alpha = MathHelper.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
                 base.Update();
             }