diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
index 779848dff6..0a322f5b72 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Beatmaps.Drawables
 
         public readonly BindableBool Downloaded = new BindableBool();
 
-        public event Action OnAlreadyDownloading;
-
         public BeatmapSetDownloader(BeatmapSetInfo set, bool noVideo = false)
         {
             this.set = set;
@@ -50,18 +48,16 @@ namespace osu.Game.Beatmaps.Drawables
             }
         }
 
-        public void Download()
+        public bool Download()
         {
             if (Downloaded.Value)
-                return;
+                return false;
 
             if (beatmaps.GetExistingDownload(set) != null)
-            {
-                OnAlreadyDownloading?.Invoke();
-                return;
-            }
+                return false;
 
             beatmaps.Download(set, noVideo);
+            return true;
         }
 
         private void setAdded(BeatmapSetInfo s)
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
index 8c6c8dbaa1..37fa562a73 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
@@ -64,7 +64,16 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 },
             });
 
-            Action = downloader.Download;
+            Action = () =>
+            {
+                if (!downloader.Download())
+                {
+                    Content.MoveToX(-5, 50, Easing.OutSine).Then()
+                           .MoveToX(5, 100, Easing.InOutSine).Then()
+                           .MoveToX(-5, 100, Easing.InOutSine).Then()
+                           .MoveToX(0, 50, Easing.InSine);
+                }
+            };
 
             downloader.Downloaded.ValueChanged += d =>
             {
@@ -73,14 +82,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 else
                     this.FadeIn(200);
             };
-
-            downloader.OnAlreadyDownloading += () =>
-            {
-                Content.MoveToX(-5, 50, Easing.OutSine).Then()
-                       .MoveToX(5, 100, Easing.InOutSine).Then()
-                       .MoveToX(-5, 100, Easing.InOutSine).Then()
-                       .MoveToX(0, 50, Easing.InSine);
-            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Direct/DownloadButton.cs b/osu.Game/Overlays/Direct/DownloadButton.cs
index a621199916..1ffa8dbd35 100644
--- a/osu.Game/Overlays/Direct/DownloadButton.cs
+++ b/osu.Game/Overlays/Direct/DownloadButton.cs
@@ -30,7 +30,16 @@ namespace osu.Game.Overlays.Direct
                 },
             };
 
-            Action = downloader.Download;
+            Action = () =>
+            {
+                if (!downloader.Download())
+                {
+                    Content.MoveToX(-5, 50, Easing.OutSine).Then()
+                           .MoveToX(5, 100, Easing.InOutSine).Then()
+                           .MoveToX(-5, 100, Easing.InOutSine).Then()
+                           .MoveToX(0, 50, Easing.InSine);
+                }
+            };
 
             downloader.Downloaded.ValueChanged += d =>
             {
@@ -39,14 +48,6 @@ namespace osu.Game.Overlays.Direct
                 else
                     this.FadeIn(200);
             };
-
-            downloader.OnAlreadyDownloading += () =>
-            {
-                Content.MoveToX(-5, 50, Easing.OutSine).Then()
-                       .MoveToX(5, 100, Easing.InOutSine).Then()
-                       .MoveToX(-5, 100, Easing.InOutSine).Then()
-                       .MoveToX(0, 50, Easing.InSine);
-            };
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)