diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index a31291e1b8..58aff16de0 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -25,10 +25,7 @@ namespace osu.Game.Overlays.Notifications
         public float Progress
         {
             get { return progressBar.Progress; }
-            set
-            {
-                progressBar.Progress = value;
-            }
+            set { Schedule(() => progressBar.Progress = value); }
         }
 
         protected override void LoadComplete()
@@ -44,41 +41,44 @@ namespace osu.Game.Overlays.Notifications
             get { return state; }
             set
             {
-                bool stateChanged = state != value;
-                state = value;
-
-                if (IsLoaded)
+                Schedule(() =>
                 {
-                    switch (state)
-                    {
-                        case ProgressNotificationState.Queued:
-                            Light.Colour = colourQueued;
-                            Light.Pulsate = false;
-                            progressBar.Active = false;
-                            break;
-                        case ProgressNotificationState.Active:
-                            Light.Colour = colourActive;
-                            Light.Pulsate = true;
-                            progressBar.Active = true;
-                            break;
-                        case ProgressNotificationState.Cancelled:
-                            Light.Colour = colourCancelled;
-                            Light.Pulsate = false;
-                            progressBar.Active = false;
-                            break;
-                    }
-                }
+                    bool stateChanged = state != value;
+                    state = value;
 
-                if (stateChanged)
-                {
-                    switch (state)
+                    if (IsLoaded)
                     {
-                        case ProgressNotificationState.Completed:
-                            NotificationContent.MoveToY(-DrawSize.Y / 2, 200, Easing.OutQuint);
-                            this.FadeOut(200).Finally(d => Completed());
-                            break;
+                        switch (state)
+                        {
+                            case ProgressNotificationState.Queued:
+                                Light.Colour = colourQueued;
+                                Light.Pulsate = false;
+                                progressBar.Active = false;
+                                break;
+                            case ProgressNotificationState.Active:
+                                Light.Colour = colourActive;
+                                Light.Pulsate = true;
+                                progressBar.Active = true;
+                                break;
+                            case ProgressNotificationState.Cancelled:
+                                Light.Colour = colourCancelled;
+                                Light.Pulsate = false;
+                                progressBar.Active = false;
+                                break;
+                        }
                     }
-                }
+
+                    if (stateChanged)
+                    {
+                        switch (state)
+                        {
+                            case ProgressNotificationState.Completed:
+                                NotificationContent.MoveToY(-DrawSize.Y / 2, 200, Easing.OutQuint);
+                                this.FadeOut(200).Finally(d => Completed());
+                                break;
+                        }
+                    }
+                });
             }
         }
 
@@ -232,4 +232,4 @@ namespace osu.Game.Overlays.Notifications
         Completed,
         Cancelled
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Tests/Visual/TestCaseNotificationOverlay.cs b/osu.Game/Tests/Visual/TestCaseNotificationOverlay.cs
index fead5c8b24..ed331076b2 100644
--- a/osu.Game/Tests/Visual/TestCaseNotificationOverlay.cs
+++ b/osu.Game/Tests/Visual/TestCaseNotificationOverlay.cs
@@ -66,13 +66,11 @@ namespace osu.Game.Tests.Visual
 
             progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed);
 
-            while (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
+            if (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
             {
                 var p = progressingNotifications.FirstOrDefault(n => n.IsAlive && n.State == ProgressNotificationState.Queued);
-                if (p == null)
-                    break;
-
-                p.State = ProgressNotificationState.Active;
+                if (p != null)
+                    p.State = ProgressNotificationState.Active;
             }
 
             foreach (var n in progressingNotifications.FindAll(n => n.State == ProgressNotificationState.Active))