diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index d7f2bfc546..9ac6ace0ea 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -25,7 +25,9 @@ namespace osu.Game.Overlays
 {
     public class MusicController : OverlayContainer
     {
-        private Sprite backgroundSprite;
+        private static readonly Vector2 start_position = new Vector2(10, 60);
+
+        private MusicControllerBackground backgroundSprite;
         private DragBar progress;
         private TextAwesome playButton, listButton;
         private SpriteText title, artist;
@@ -49,17 +51,19 @@ namespace osu.Game.Overlays
             Width = 400;
             Height = 130;
             CornerRadius = 5;
+            EdgeEffect = new EdgeEffect
+            {
+                Type = EdgeEffectType.Shadow,
+                Colour = new Color4(0, 0, 0, 40),
+                Radius = 5,
+            };
+
             Masking = true;
             Anchor = Anchor.TopRight;//placeholder
             Origin = Anchor.TopRight;
-            Position = new Vector2(10, 60);
+            Position = start_position;
             Children = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = new Color4(0, 0, 0, 127)
-                },
                 title = new SpriteText
                 {
                     Origin = Anchor.BottomCentre,
@@ -80,14 +84,6 @@ namespace osu.Game.Overlays
                     Text = @"Nothing to play",
                     Font = @"Exo2.0-BoldItalic"
                 },
-                new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 50,
-                    Origin = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
-                    Colour = new Color4(0, 0, 0, 127)
-                },
                 new ClickableContainer
                 {
                     AutoSizeAxes = Axes.Both,
@@ -177,6 +173,25 @@ namespace osu.Game.Overlays
             };
         }
 
+        protected override bool OnDragStart(InputState state) => true;
+
+        protected override bool OnDrag(InputState state)
+        {
+            Vector2 change = (state.Mouse.Position - state.Mouse.PositionMouseDown.Value);
+            change.X = -change.X;
+
+            change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;
+
+            MoveTo(start_position + change);
+            return base.OnDrag(state);
+        }
+
+        protected override bool OnDragEnd(InputState state)
+        {
+            MoveTo(start_position, 800, EasingTypes.OutElastic);
+            return base.OnDragEnd(state);
+        }
+
         protected override void Load(BaseGame game)
         {
             base.Load(game);
@@ -194,7 +209,7 @@ namespace osu.Game.Overlays
             beatmapSource = osuGame?.Beatmap ?? new Bindable<WorkingBeatmap>();
             playList = database.GetAllWithChildren<BeatmapSetInfo>();
 
-            backgroundSprite = getScaledSprite(fallbackTexture = game.Textures.Get(@"Backgrounds/bg4"));
+            backgroundSprite = new MusicControllerBackground(fallbackTexture = game.Textures.Get(@"Backgrounds/bg4"));
             AddInternal(backgroundSprite);
         }
 
@@ -296,7 +311,7 @@ namespace osu.Game.Overlays
             title.Text = config.GetUnicodeString(metadata.Title, metadata.TitleUnicode);
             artist.Text = config.GetUnicodeString(metadata.Artist, metadata.ArtistUnicode);
 
-            Sprite newBackground = getScaledSprite(beatmap.Background ?? fallbackTexture);
+            MusicControllerBackground newBackground = new MusicControllerBackground(beatmap.Background ?? fallbackTexture);
 
             Add(newBackground);
 
@@ -317,25 +332,12 @@ namespace osu.Game.Overlays
             backgroundSprite = newBackground;
         }
 
-        private Sprite getScaledSprite(Texture background)
-        {
-            Sprite scaledSprite = new Sprite
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Texture = background,
-                Depth = float.MinValue
-            };
-            scaledSprite.Scale = new Vector2(Math.Max(DrawSize.X / scaledSprite.DrawSize.X, DrawSize.Y / scaledSprite.DrawSize.Y));
-            return scaledSprite;
-        }
-
         private void seek(float position)
         {
             current?.Track?.Seek(current.Track.Length * position);
             current?.Track?.Start();
         }
-        
+
         protected override void Dispose(bool isDisposing)
         {
             if (preferUnicode != null)
@@ -347,11 +349,44 @@ namespace osu.Game.Overlays
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
 
-        protected override bool OnDragStart(InputState state) => true;
-
         //placeholder for toggling
         protected override void PopIn() => FadeIn(100);
 
         protected override void PopOut() => FadeOut(100);
+
+        private class MusicControllerBackground : BufferedContainer
+        {
+            private Sprite sprite;
+
+            public MusicControllerBackground(Texture backgroundTexture)
+            {
+                CacheDrawnFrameBuffer = true;
+                RelativeSizeAxes = Axes.Both;
+                Depth = float.MinValue;
+
+                Children = new Drawable[]
+                {
+                    sprite = new Sprite
+                    {
+                        Texture = backgroundTexture,
+                        Colour = new Color4(150, 150, 150, 255)
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 50,
+                        Origin = Anchor.BottomCentre,
+                        Anchor = Anchor.BottomCentre,
+                        Colour = new Color4(0, 0, 0, 127)
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                sprite.Scale = new Vector2(Math.Max(DrawSize.X / sprite.DrawSize.X, DrawSize.Y / sprite.DrawSize.Y));
+            }
+        }
     }
 }