diff --git a/Modules/AppDrawer/AppDrawerPopout.qml b/Modules/AppDrawer/AppDrawerPopout.qml
index ac04cdc7..ab68121e 100644
--- a/Modules/AppDrawer/AppDrawerPopout.qml
+++ b/Modules/AppDrawer/AppDrawerPopout.qml
@@ -15,7 +15,7 @@ PanelWindow {
 
   property bool isVisible: false
   property real triggerX: Theme.spacingL
-  property real triggerY: Theme.barHeight + Theme.spacingXS
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
   property real triggerWidth: 40
   property string triggerSection: "left"
   property var triggerScreen: null
diff --git a/Modules/CentcomCenter/CentcomPopout.qml b/Modules/CentcomCenter/CentcomPopout.qml
index 3c72b76b..1b67297f 100644
--- a/Modules/CentcomCenter/CentcomPopout.qml
+++ b/Modules/CentcomCenter/CentcomPopout.qml
@@ -15,7 +15,7 @@ PanelWindow {
   readonly property bool hasActiveMedia: MprisController.activePlayer !== null
   property bool calendarVisible: false
   property real triggerX: (Screen.width - 480) / 2
-  property real triggerY: Theme.barHeight + 4
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + 4
   property real triggerWidth: 80
   property string triggerSection: "center"
   property var triggerScreen: null
diff --git a/Modules/ControlCenter/ControlCenterPopout.qml b/Modules/ControlCenter/ControlCenterPopout.qml
index d1bfa9a0..176a3d4a 100644
--- a/Modules/ControlCenter/ControlCenterPopout.qml
+++ b/Modules/ControlCenter/ControlCenterPopout.qml
@@ -19,7 +19,7 @@ PanelWindow {
   property bool powerOptionsExpanded: false
   property var triggerScreen: null
   property real triggerX: Screen.width - 600 - Theme.spacingL
-  property real triggerY: Theme.barHeight + Theme.spacingXS
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
   property real triggerWidth: 80
   property string triggerSection: "right"
 
@@ -71,7 +71,7 @@ PanelWindow {
     active: controlCenterVisible
     width: targetWidth
     height: root.powerOptionsExpanded ? 570 : 500
-    y: Theme.barHeight + Theme.spacingXS
+    y: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
     x: {
       var centerX = root.triggerX + (root.triggerWidth / 2) - (targetWidth / 2)
 
diff --git a/Modules/Notifications/Center/NotificationCenterPopout.qml b/Modules/Notifications/Center/NotificationCenterPopout.qml
index e3bf1b00..1ccbf3cd 100644
--- a/Modules/Notifications/Center/NotificationCenterPopout.qml
+++ b/Modules/Notifications/Center/NotificationCenterPopout.qml
@@ -14,7 +14,7 @@ PanelWindow {
 
   property bool notificationHistoryVisible: false
   property real triggerX: Screen.width - 400 - Theme.spacingL
-  property real triggerY: Theme.barHeight + Theme.spacingXS
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
   property real triggerWidth: 40
   property string triggerSection: "right"
   
diff --git a/Modules/Notifications/Popup/NotificationPopup.qml b/Modules/Notifications/Popup/NotificationPopup.qml
index 560eb75f..5eb7f516 100644
--- a/Modules/Notifications/Popup/NotificationPopup.qml
+++ b/Modules/Notifications/Popup/NotificationPopup.qml
@@ -73,7 +73,7 @@ PanelWindow {
   color: "transparent"
   implicitWidth: 400
   implicitHeight: 122
-  onScreenYChanged: margins.top = Theme.barHeight + 4 + screenY
+  onScreenYChanged: margins.top = Theme.barHeight - 4 + SettingsData.topBarSpacing + 4 + screenY
   onHasValidDataChanged: {
     if (!hasValidData && !exiting && !_isDestroying) {
 
@@ -116,7 +116,7 @@ PanelWindow {
   }
 
   margins {
-    top: Theme.barHeight + 4
+    top: Theme.barHeight - 4 + SettingsData.topBarSpacing + 4
     right: 12
   }
 
diff --git a/Modules/ProcessList/ProcessListPopout.qml b/Modules/ProcessList/ProcessListPopout.qml
index 09e065bf..c87918e9 100644
--- a/Modules/ProcessList/ProcessListPopout.qml
+++ b/Modules/ProcessList/ProcessListPopout.qml
@@ -17,7 +17,7 @@ PanelWindow {
   property bool isVisible: false
   property var parentWidget: null
   property real triggerX: Screen.width - 600 - Theme.spacingL
-  property real triggerY: Theme.barHeight + Theme.spacingXS
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
   property real triggerWidth: 55
   property string triggerSection: "right"
   property var triggerScreen: null
diff --git a/Modules/Toast.qml b/Modules/Toast.qml
index 4b143bd6..8e1a60f6 100644
--- a/Modules/Toast.qml
+++ b/Modules/Toast.qml
@@ -42,7 +42,7 @@ PanelWindow {
     width: ToastService.hasDetails ? 380 : messageText.implicitWidth + Theme.iconSize + Theme.spacingM * 3 + Theme.spacingL * 2
     height: toastContent.height + Theme.spacingL * 2
     anchors.horizontalCenter: parent.horizontalCenter
-    y: Theme.barHeight + 2
+    y: Theme.barHeight - 4 + SettingsData.topBarSpacing + 2
     color: {
       switch (ToastService.currentLevel) {
       case ToastService.levelError:
diff --git a/Modules/TopBar/BatteryPopout.qml b/Modules/TopBar/BatteryPopout.qml
index 26f978e7..0a4a727e 100644
--- a/Modules/TopBar/BatteryPopout.qml
+++ b/Modules/TopBar/BatteryPopout.qml
@@ -13,7 +13,7 @@ PanelWindow {
 
   property bool batteryPopupVisible: false
   property real triggerX: Screen.width - 380 - Theme.spacingL
-  property real triggerY: Theme.barHeight + Theme.spacingS
+  property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingS
   property real triggerWidth: 70
   property string triggerSection: "right"
   property var triggerScreen: null