2 files changed, 4 insertions, 8 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml b/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml
index 03406687..83418e76 100644
--- a/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml
+++ b/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml
@@ -15,7 +15,7 @@ Scope {
     id: notifsRepeater
 
     model: ScriptModel {
-      values: NotificationManager.active ? [] : NotificationManager.groups
+      values: NotificationManager.active ? NotificationManager.groups : []
     }
 
     delegate: PanelWindow {
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
index 19b8b606..09d45719 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
@@ -7,7 +7,7 @@ import Quickshell.Services.Notifications
 Singleton {
   id: root
 
-  readonly property bool active: !lockscreenActive && !displayInhibited
+  readonly property bool active: !root.lockscreenActive && !root.displayInhibited
   property bool lockscreenActive: false
   property bool displayInhibited: false
   property alias trackedNotifications: server.trackedNotifications
@@ -70,13 +70,9 @@ Singleton {
       required property int expirationTime
       property list<QtObject> data: [
         Timer {
-          running: root.active
+          running: root.active && !timer.parent.retained
           interval: timer.expirationTime
-          onTriggered: {
-            timer.parent.expirationTimer = null;
-            timer.parent.expire();
-            this.deleteLater();
-          }
+          onTriggered: timer.parent.expire()
         }
       ]
     }