diff --git a/modules/notification/NotificationBody.qml b/modules/notification/NotificationBody.qml
index 6b3bdfd..827ee62 100644
--- a/modules/notification/NotificationBody.qml
+++ b/modules/notification/NotificationBody.qml
@@ -25,7 +25,7 @@ Rectangle {
 
     implicitWidth: screen.width/7
     // implicitHeight: screen.height/7
-    implicitHeight: contentRowRectangle.height+(notification.actions.length>0?actionRowRectangle.height:0)+(notification.hasInlineReply?inlineReplyRectangle.height:0)+progressBar.height
+    implicitHeight: contentRowRectangle.height+(actionRowRectangle.visible?actionRowRectangle.height:0)+(inlineReplyRectangle.visible?inlineReplyRectangle.height:0)+(progressBar.visible?progressBar.height:0)
 
     color: textBGColor
     border.width: Config.border_width
@@ -201,11 +201,7 @@ Rectangle {
 
                         onClicked: {
                             modelData.invoke()
-                            if (!notification.resident) {
-                                root.closeNotification(true)
-                            } else {
-                                root.closeNotification(false)
-                            }
+                            root.closeNotification(false)
                         }
                     }
                 }
@@ -224,7 +220,7 @@ Rectangle {
             function sendReply(message) {
                 notification.sendInlineReply(message)
                 inlineReplyTextField.focus = false
-                root.closeNotification(true)
+                root.closeNotification(false)
             }
 
             Row {
@@ -297,6 +293,7 @@ Rectangle {
             // anchors.left: parent.left
             height: Config.screen_height_to_font_tiny(screen.height)
             color: textColor
+            visible: root.duration > 0
 
             property real progress: 1.0
             width: parent.width * progress