diff --git a/modules/notification/Notification.qml b/modules/notification/Notification.qml
index 0868506..3698a5d 100644
--- a/modules/notification/Notification.qml
+++ b/modules/notification/Notification.qml
@@ -68,7 +68,7 @@ PanelWindow {
                         const summary = notification.summary
                         if (dismiss) {
                             Config.debug == "Notification" && console.log("[NotificationWindow " + Hyprland.monitorFor(screen).activeWorkspace.id + "]: Dissmiss: " + appName + " " + id + " - " + summary)
-                            notification.tracked ? notification.dismiss()
+                            if (notification.tracked) {notification.dismiss()}
                             notificationListModel.remove(index)
                         } else {
                             Config.debug == "Notification" && console.log("[NotificationWindow " + Hyprland.monitorFor(screen).activeWorkspace.id + "]: Close: " + appName + " " + id + " - " + summary)
diff --git a/modules/notification/NotificationBody.qml b/modules/notification/NotificationBody.qml
index 24fbea0..6b3bdfd 100644
--- a/modules/notification/NotificationBody.qml
+++ b/modules/notification/NotificationBody.qml
@@ -15,11 +15,11 @@ Rectangle {
 
     property bool closing: false
 
-    property real duration: ( notification.hasInlineReply ? 5000000000 : 1000)
-    //     notification.expireTimeout > 0 ? notification.expireTimeout :
-    //     urgency ? urgency * 2000 :
-    //     5000
-    // )
+    property real duration: (
+        notification.expireTimeout > 0 ? notification.expireTimeout :
+        urgency ? urgency * 2000 :
+        5000
+    )
 
     signal dismissed(var notification, bool dismiss)
 
@@ -224,12 +224,7 @@ Rectangle {
             function sendReply(message) {
                 notification.sendInlineReply(message)
                 inlineReplyTextField.focus = false
-
-                if (!notification.resident) {
-                    root.closeNotification(true)
-                } else {
-                    root.closeNotification(false)
-                }
+                root.closeNotification(true)
             }
 
             Row {