diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs
index 6067952a69..b4d675fc0b 100644
--- a/osu.Game/GameModes/Play/PlaySongSelect.cs
+++ b/osu.Game/GameModes/Play/PlaySongSelect.cs
@@ -105,7 +105,10 @@ namespace osu.Game.GameModes.Play
                             Width = 100,
                             Text = "Play",
                             Colour = new Color4(238, 51, 153, 255),
-                            Action = () => Push(new Player { BeatmapInfo = selectedBeatmapGroup.SelectedPanel.Beatmap }),
+                            Action = () => Push(new Player {
+                                BeatmapInfo = selectedBeatmapGroup.SelectedPanel.Beatmap,
+                                PlayMode = playMode.Value
+                            }),
                         },
                     }
                 }
diff --git a/osu.Game/GameModes/Play/Player.cs b/osu.Game/GameModes/Play/Player.cs
index 8ecb698766..4e18f06f5b 100644
--- a/osu.Game/GameModes/Play/Player.cs
+++ b/osu.Game/GameModes/Play/Player.cs
@@ -56,7 +56,7 @@ namespace osu.Game.GameModes.Play
                     };
                     break;
                 case PlayMode.Taiko:
-                    scoreOverlay = null;
+                    scoreOverlay = new ScoreOverlayOsu();
 
                     hitRenderer = new TaikoHitRenderer
                     {
@@ -66,7 +66,7 @@ namespace osu.Game.GameModes.Play
                     };
                     break;
                 case PlayMode.Catch:
-                    scoreOverlay = null;
+                    scoreOverlay = new ScoreOverlayOsu();
 
                     hitRenderer = new CatchHitRenderer
                     {
@@ -76,7 +76,7 @@ namespace osu.Game.GameModes.Play
                     };
                     break;
                 case PlayMode.Mania:
-                    scoreOverlay = null;
+                    scoreOverlay = new ScoreOverlayOsu();
 
                     hitRenderer = new ManiaHitRenderer
                     {