diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 15785ea6bd..771bcd2310 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -383,7 +383,7 @@ namespace osu.Game
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(PlaySongSelect) });
+            }, validScreens: new[] { typeof(SongSelect) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 7999023998..3df9ca5305 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -82,7 +82,9 @@ namespace osu.Game
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
+            var type = current.GetType();
+
+            if (validScreens.Any(t => type.IsAssignableFrom(t)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
@@ -91,13 +93,14 @@ namespace osu.Game
 
             while (current != null)
             {
-                if (validScreens.Contains(current.GetType()))
+                if (validScreens.Any(t => type.IsAssignableFrom(t)))
                 {
                     current.MakeCurrent();
                     break;
                 }
 
                 current = current.GetParentScreen();
+                type = current?.GetType();
             }
         }