diff --git a/surfsense_web/app/dashboard/[workspace_id]/user-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[workspace_id]/user-settings/layout-shell.tsx
index 684b7d6f4..0e33a5be5 100644
--- a/surfsense_web/app/dashboard/[workspace_id]/user-settings/layout-shell.tsx
+++ b/surfsense_web/app/dashboard/[workspace_id]/user-settings/layout-shell.tsx
@@ -122,7 +122,7 @@ export function UserSettingsLayoutShell({ workspaceId, children }: UserSettingsL
 	const hrefFor = (tab: UserSettingsTab) => `/dashboard/${workspaceId}/user-settings/${tab}`;
 
 	return (
-		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-10 md:flex-row">
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:flex-row">
 			<div className="md:w-[220px] md:shrink-0">
 				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
 				<nav className="hidden flex-col gap-0.5 md:flex">
diff --git a/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx
index 320dac9ba..79680ae9f 100644
--- a/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx
+++ b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx
@@ -79,7 +79,7 @@ export function SearchSpaceSettingsLayoutShell({
 		`/dashboard/${workspaceId}/workspace-settings/${tab}`;
 
 	return (
-		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-6 md:flex-row">
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:flex-row">
 			<div className="md:w-[220px] md:shrink-0">
 				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
 				<nav className="hidden flex-col gap-0.5 md:flex">
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 5af6213ac..4f52f9899 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -758,7 +758,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 					isTeamPage ||
 					isAutomationsPage ||
 					isAllChatsPage
-						? "items-start justify-center px-6 py-8 md:px-10 md:py-10"
+						? "items-start justify-center px-6 py-8 md:px-10 md:pb-10 md:pt-16"
 						: undefined
 				}
 				workspacePanelContentClassName={
diff --git a/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx
index ae5dac223..e8f2e6254 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx
@@ -234,7 +234,7 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 
 	return (
 		<div className={cn("flex h-full min-h-0 w-full flex-1 flex-col", className)}>
-			<div className="shrink-0 space-y-4 px-3 pb-3 pt-3">
+			<div className="shrink-0 space-y-4 px-3 pb-3">
 				<div className="flex items-center justify-between gap-4 flex-wrap">
 					<div className="flex items-baseline gap-3">
 						<h1 className="text-xl md:text-2xl font-semibold text-foreground">
@@ -550,7 +550,7 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 
 export function AllChatsWorkspaceContent({ searchSpaceId }: { searchSpaceId: string }) {
 	return (
-		<div className="flex h-[calc(100vh-8rem)] min-h-0 w-full overflow-hidden text-sidebar-foreground">
+		<div className="flex h-full min-h-0 w-full overflow-hidden text-sidebar-foreground">
 			<AllChatsContent searchSpaceId={searchSpaceId} />
 		</div>
 	);