1 files changed, 5 insertions, 3 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
index 531d26c3..f02d1695 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
@@ -69,14 +69,14 @@ Singleton {
 
       required property QtObject parent
       required property int expirationTime
-      property bool expired: false
 
       property list<QtObject> data: [
         Timer {
           running: root.active && !timer.expired
           interval: timer.expirationTime
           onTriggered: {
-            timer.expired = true;
+            timer.parent.expirationTimer.destroy();
+            timer.parent.expirationTimer = null;
             timer.parent.expire();
           }
         }
@@ -148,8 +148,10 @@ Singleton {
     }
 
     function onNotificationClosed(notification, reason) {
-      while (root.history.length >= root.historyLimit)
+      while (root.history.length >= root.historyLimit) {
+        root.history[0].lock.locked = false;
         root.history.shift();
+      }
 
       root.history.push({
         lock: notificationLock.createObject(root, { locked: true, object: notification }),