diff --git a/modules/notification/NotificationBody.qml b/modules/notification/NotificationBody.qml
index c0e644e..78dd8ab 100644
--- a/modules/notification/NotificationBody.qml
+++ b/modules/notification/NotificationBody.qml
@@ -44,7 +44,7 @@ Rectangle {
 
     Connections {
         target: root.notification
-        onClosed: function(reason){
+        function onClosed(reason){
             // It is known that it can be triggered twice and delete multiple Index but since it is only temporary display and the chance is low it is ignored
             root.closeNotification(false)
         }
@@ -71,14 +71,14 @@ Rectangle {
             border.width: Config.border_width
             border.color: textColor
 
-            MouseArea { // covers cross only, not whole row
+            MouseArea {
                 id: closingMouseArea
                 anchors.top: parent.top
                 anchors.right: parent.right
-                anchors.margins: Config.spacing // or 10 to match Row margins
+                anchors.margins: Config.spacing
 
-                width: closeIconText.height
-                height: closeIconText.height // Config.screen_height_to_font_small(screen.height) ~12-16
+                width: closeIconText.implicitHeight + Config.spacing
+                height: closeIconText.implicitHeight + Config.spacing
 
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
@@ -99,7 +99,7 @@ Rectangle {
                         color: parent.parent.containsMouse ? Colors.error_fg : textColor
                     }
                 }
-                onClicked: {
+                onClicked: function(mouse){
                     mouse.accepted=true
                     root.closeNotification(true)
                 }
@@ -244,7 +244,8 @@ Rectangle {
                             }
                         }
 
-                        onClicked: {
+                        onClicked: function(mouse){
+                            mouse.accepted=true
                             modelData.invoke()
                             // resident check is allready in .invoke()
                             root.closeNotification(false)
@@ -325,7 +326,8 @@ Rectangle {
                             anchors.centerIn: parent
                         }
                     }
-                    onClicked: {
+                    onClicked: function(mouse){
+                        mouse.accepted=true;
                         console.log("[NotificationBodyInlineReply]: Pressed SEND:", inlineReplyTextField.text)
                         inlineReplyRectangle.sendReply(inlineReplyTextField.text)
                     }