diff --git a/osu-framework b/osu-framework
index 979fb1ffdf..21a97586f7 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 979fb1ffdfaa08c39ff4f0cdda42e5b313d70534
+Subproject commit 21a97586f7fa8d9aa65b4131824151d88a70b520
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 86ec6b37e2..1fd19af557 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool HideOnEscape => false;
 
-        protected override bool BlockPassThroughInput => false;
+        protected override bool BlockPassThroughMouse => false;
 
         private const double transition_time = 500;
 
diff --git a/osu.Game/Screens/Play/MenuOverlay.cs b/osu.Game/Screens/Play/MenuOverlay.cs
index 738e5cc35d..fa522956f7 100644
--- a/osu.Game/Screens/Play/MenuOverlay.cs
+++ b/osu.Game/Screens/Play/MenuOverlay.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play
 
         protected override bool HideOnEscape => false;
 
+        protected override bool BlockPassThroughKeyboard => true;
+
         public Action OnRetry;
         public Action OnQuit;
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c37609acd0..a87d5f58a1 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select
 
         protected override bool HideOnEscape => false;
 
-        protected override bool BlockPassThroughInput => false;
+        protected override bool BlockPassThroughMouse => false;
 
         protected override void PopIn()
         {