diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0f568acc29..9fe9050b39 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -86,16 +86,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        public override bool RequestingFocus => State == Visibility.Visible;
-
-        protected override bool OnFocus(InputState state) => true;
-        protected override void OnFocusLost(InputState state)
-        {
-            if (state.Keyboard.Keys.Contains(Key.Escape))
-                Hide();
-            base.OnFocusLost(state);
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index e184ff9201..c454c4bd1d 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Transformations;
 
 namespace osu.Game.Overlays
 {
-    public abstract class WaveOverlayContainer : OverlayContainer
+    public abstract class WaveOverlayContainer : FocusedOverlayContainer
     {
         protected const float APPEAR_DURATION = 800;
         protected const float DISAPPEAR_DURATION = 500;