diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d7268fb186..d0a507be98 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -65,6 +65,14 @@ namespace osu.Game.Overlays.Mods
             Ruleset.TriggerChange();
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            Ruleset.UnbindAll();
+            SelectedMods.UnbindAll();
+        }
+
         private void selectedModsChanged(IEnumerable<Mod> obj)
         {
             foreach (ModSection section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 739bc39269..71aa85b116 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -1,11 +1,13 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Collections.Generic;
 using System.Linq;
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
@@ -47,13 +49,15 @@ namespace osu.Game.Screens.Select
 
         private SampleChannel sampleConfirm;
 
+        public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>(new List<Mod>());
+
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, AudioManager audio, BeatmapManager beatmaps, DialogOverlay dialogOverlay, OsuGame game)
         {
-            sampleConfirm = audio.Sample.Get(@"SongSelect/confirm-selection");
+            SelectedMods.BindTo(game.SelectedMods);
+            modSelect.SelectedMods.BindTo(SelectedMods);
 
-            if (game != null)
-                modSelect.SelectedMods.BindTo(game.SelectedMods);
+            sampleConfirm = audio.Sample.Get(@"SongSelect/confirm-selection");
 
             Footer.AddButton(@"mods", colours.Yellow, modSelect, Key.F1, float.MaxValue);
 
@@ -80,7 +84,7 @@ namespace osu.Game.Screens.Select
         {
             base.UpdateBeatmap(beatmap);
 
-            beatmap.Mods.BindTo(modSelect.SelectedMods);
+            beatmap.Mods.BindTo(SelectedMods);
 
             BeatmapDetails.Beatmap = beatmap;
 
@@ -95,7 +99,7 @@ namespace osu.Game.Screens.Select
             if (removeAutoModOnResume)
             {
                 var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod().GetType();
-                modSelect.SelectedMods.Value = modSelect.SelectedMods.Value.Where(m => m.GetType() != autoType).ToArray();
+                SelectedMods.Value = SelectedMods.Value.Where(m => m.GetType() != autoType).ToArray();
                 removeAutoModOnResume = false;
             }
 
@@ -125,7 +129,7 @@ namespace osu.Game.Screens.Select
             if (Beatmap.Value.Track != null)
                 Beatmap.Value.Track.Looping = false;
 
-            Beatmap.Value.Mods.UnbindBindings();
+            SelectedMods.UnbindAll();
             Beatmap.Value.Mods.Value = new Mod[] { };
 
             return false;