diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs
index 124406d7bb..a9210c69fb 100644
--- a/osu.Game/Graphics/UserInterface/IconButton.cs
+++ b/osu.Game/Graphics/UserInterface/IconButton.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Graphics.UserInterface
             set { icon.Scale = value; }
         }
 
-        private Color4 disableColour;
-
         public IconButton()
         {
             AutoSizeAxes = Axes.Both;
@@ -82,9 +80,8 @@ namespace osu.Game.Graphics.UserInterface
         {
             hover.Colour = colours.Yellow.Opacity(0.6f);
             flashColour = colours.Yellow;
-            disableColour = colours.Gray9;
 
-            Enabled.ValueChanged += newEnabled => FadeColour(newEnabled ? Color4.White : disableColour, 200, EasingTypes.OutQuint);
+            Enabled.ValueChanged += newEnabled => FadeColour(newEnabled ? Color4.White : colours.Gray9, 200, EasingTypes.OutQuint);
         }
 
         protected override bool OnHover(InputState state)
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 8845f11d86..a5be07401d 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -207,13 +207,7 @@ namespace osu.Game.Overlays
 
             beatmapBacking.BindTo(game.Beatmap);
 
-            playlistButtonColor = colours.Yellow;
-
-            playlist.StateChanged += (c, s) =>
-            {
-                if (playlistButton.Enabled)
-                    playlistButton.FadeColour(s == Visibility.Visible ? playlistButtonColor : Color4.White, 200, EasingTypes.OutQuint);
-            };
+            playlist.StateChanged += (c, s) => playlistButton.FadeColour(s == Visibility.Visible ? colours.Yellow : Color4.White, 200, EasingTypes.OutQuint);
         }
 
         protected override void LoadComplete()
@@ -227,12 +221,12 @@ namespace osu.Game.Overlays
 
         private void beatmapDisabledChanged(bool disabled)
         {
+            if (disabled)
+                playlist.Hide();
+
             prevButton.Enabled.Value = !disabled;
             nextButton.Enabled.Value = !disabled;
             playlistButton.Enabled.Value = !disabled;
-
-            if (disabled)
-                playlist.Hide();
         }
 
         protected override void UpdateAfterChildren()