diff --git a/modules/Bar.qml b/modules/Bar.qml
index 6893eb0..74364e2 100644
--- a/modules/Bar.qml
+++ b/modules/Bar.qml
@@ -97,8 +97,8 @@ PanelWindow {
     Item {
         anchors.fill: parent
         anchors.topMargin: 3
-        anchors.leftMargin: 6
-        anchors.rightMargin: 6
+        anchors.leftMargin: Math.max(M.Theme.barPadding, M.Theme.screenRadius)
+        anchors.rightMargin: Math.max(M.Theme.barPadding, M.Theme.screenRadius)
 
         // ---- center (declared first so left/right can anchor to it) ----
         RowLayout {
diff --git a/modules/NotifPopup.qml b/modules/NotifPopup.qml
index 787d5a4..0720c85 100644
--- a/modules/NotifPopup.qml
+++ b/modules/NotifPopup.qml
@@ -63,14 +63,6 @@ PanelWindow {
                     _entered = true;
                 }
 
-                Connections {
-                    target: M.NotifService
-                    function onPopupExpiring(notifId) {
-                        if (notifId === popupItem.modelData.id)
-                            popupItem.animateDismiss(false);
-                    }
-                }
-
                 Behavior on y {
                     enabled: popupItem._entered
                     NumberAnimation {
diff --git a/modules/NotifService.qml b/modules/NotifService.qml
index 62f197c..8a92589 100644
--- a/modules/NotifService.qml
+++ b/modules/NotifService.qml
@@ -105,15 +105,12 @@ QtObject {
         }
     }
 
-    // Signal popups to animate out before removal
-    signal popupExpiring(var notifId)
-
     property Component _expireTimer: Component {
         Timer {
             property var _notifId
             running: true
             onTriggered: {
-                root.popupExpiring(_notifId);
+                root.dismissPopup(_notifId);
                 destroy();
             }
         }