diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dc6dfdfd81..2ff0635be0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -321,21 +321,19 @@ namespace osu.Game.Screens.Select
             if (beatmap.Equals(Beatmap?.BeatmapInfo))
                 return;
 
-            bool beatmapSetChange = false;
+            bool preview = beatmap.BeatmapSetInfoID != Beatmap.BeatmapInfo.BeatmapSetInfoID;
+
             if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
                 sampleChangeDifficulty.Play();
             else
-            {
                 sampleChangeBeatmap.Play();
-                beatmapSetChange = true;
-            }
 
             selectionChangeNoBounce = beatmap;
 
             selectionChangedDebounce = Scheduler.AddDelayed(delegate
             {
                 Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
-                ensurePlayingSelected(beatmapSetChange);
+                ensurePlayingSelected(preview);
             }, 100);
         }
 
@@ -346,6 +344,7 @@ namespace osu.Game.Screens.Select
             if (track != null)
             {
                 trackManager.SetExclusive(track);
+                System.Diagnostics.Debug.WriteLine("Preview: {0}", preview);
                 if (preview)
                     track.Seek(Beatmap.Metadata.PreviewTime);
                 track.Start();