diff --git a/Drawers/Panels.qml b/Drawers/Panels.qml
index 77cda7a..eb11cfe 100644
--- a/Drawers/Panels.qml
+++ b/Drawers/Panels.qml
@@ -128,6 +128,7 @@ Item {
 		panels: root
 		screenState: root.screenState
 		sidebarPanel: sidebar
+		topPadding: Math.max(root.anchors.topMargin, root.anchors.bottomMargin)
 	}
 
 	Launcher.Wrapper {
@@ -183,7 +184,7 @@ Item {
 
 		anchors.bottom: utilities.top
 		anchors.right: parent.right
-		anchors.top: notifications.bottom
+		anchors.top: parent.top
 		panels: root
 		screenState: root.screenState
 	}
diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml
index 6ebb1f9..d0a0212 100644
--- a/Drawers/Windows.qml
+++ b/Drawers/Windows.qml
@@ -257,7 +257,7 @@ CustomWindow {
 
 			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
-			radius: Tokens.rounding.large + Tokens.padding.smaller
+			radius: Tokens.rounding.large + Tokens.padding.small
 		}
 
 		PanelBg {
diff --git a/Modules/Notifications/Content.qml b/Modules/Notifications/Content.qml
index 7ff2a89..4fc48a3 100644
--- a/Modules/Notifications/Content.qml
+++ b/Modules/Notifications/Content.qml
@@ -1,8 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Widgets
 import QtQuick
+import ZShell
 import ZShell.Components
 import ZShell.Config
 import ZShell.Services
@@ -10,12 +10,14 @@ import qs.Components
 import qs.Components.Notifs
 import qs.Daemons
 import qs.Helpers
-import qs.Services
 
 Item {
 	id: root
 
-	readonly property int padding: Tokens.padding.smaller
+	readonly property int padding: Tokens.padding.small
+	readonly property int clamped: ZUtils.clamp(padding - Config.bar.border, 0, padding)
+
+	required property int topPadding
 	required property Item panels
 	required property ScreenState screenState
 
@@ -40,7 +42,7 @@ Item {
 				height = h;
 		}
 
-		return Math.min(((QsWindow.window as QsWindow)?.screen?.height ?? 0) - 1 * 2, height + padding * 2);
+		return Math.min(((QsWindow.window as QsWindow)?.screen?.height ?? 0) + padding - clamped * 2 - topPadding, height + padding * 2);
 	}
 
 	implicitWidth: Config.notifs.sizes.width + padding * 2
diff --git a/Modules/Notifications/Wrapper.qml b/Modules/Notifications/Wrapper.qml
index e010b09..f621d17 100644
--- a/Modules/Notifications/Wrapper.qml
+++ b/Modules/Notifications/Wrapper.qml
@@ -8,6 +8,7 @@ Item {
 	required property Item panels
 	required property Item sidebarPanel
 	required property ScreenState screenState
+	required property int topPadding
 
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth
@@ -18,5 +19,6 @@ Item {
 
 		panels: root.panels
 		screenState: root.screenState
+		topPadding: root.topPadding
 	}
 }