diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 8c7ad5f061..699b8f7d89 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -57,6 +57,19 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
         }
 
+        [Test]
+        public void TestPresenceWithManualDismiss()
+        {
+            AddAssert("tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
+            AddAssert("overlay not present", () => !notificationOverlay.IsPresent);
+
+            AddStep(@"post notification", sendBackgroundNotification);
+            AddStep("click notification", () => notificationOverlay.ChildrenOfType<Notification>().Single().TriggerClick());
+
+            AddUntilStep("wait tray not present", () => !notificationOverlay.ChildrenOfType<NotificationOverlayToastTray>().Single().IsPresent);
+            AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
+        }
+
         [Test]
         public void TestCompleteProgress()
         {
diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index df9bbac887..4f98b9f40c 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -97,6 +97,8 @@ namespace osu.Game.Overlays
 
         public void Post(Notification notification)
         {
+            notification.Closed += stopTrackingNotification;
+
             ++runningDepth;
             displayedCount++;
 
@@ -139,14 +141,23 @@ namespace osu.Game.Overlays
             notification.MoveToOffset(new Vector2(400, 0), NotificationOverlay.TRANSITION_LENGTH, Easing.OutQuint);
             notification.FadeOut(NotificationOverlay.TRANSITION_LENGTH, Easing.OutQuint).OnComplete(_ =>
             {
+                notification.Closed -= stopTrackingNotification;
+                if (!notification.WasClosed)
+                    stopTrackingNotification();
+
                 RemoveInternal(notification, false);
-                displayedCount--;
                 ForwardNotificationToPermanentStore?.Invoke(notification);
 
                 notification.FadeIn(300, Easing.OutQuint);
             });
         }
 
+        private void stopTrackingNotification()
+        {
+            Debug.Assert(displayedCount > 0);
+            displayedCount--;
+        }
+
         protected override void Update()
         {
             base.Update();