diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 1f038a39b..09f53db11 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -11,9 +11,9 @@ import {
 	Laptop,
 	ListFilter,
 	Lock,
-	MoreHorizontal,
 	Paperclip,
 	Server,
+	SlidersVertical,
 	Trash2,
 	Upload,
 	X,
@@ -92,6 +92,7 @@ import { uploadFolderScan } from "@/lib/folder-sync-upload";
 import { getWorkspaceIdNumber } from "@/lib/route-params";
 import { getSupportedExtensionsSet } from "@/lib/supported-extensions";
 import { queries } from "@/zero/queries/index";
+import { SidebarSection } from "./SidebarSection";
 import { SidebarSlideOutPanel } from "./SidebarSlideOutPanel";
 
 const DesktopLocalTabContent = dynamic(
@@ -133,7 +134,7 @@ function downloadTextFile(content: string, fileName: string, type = "text/markdo
 	URL.revokeObjectURL(url);
 }
 
-function EmbeddedDocumentsMenu({
+export function EmbeddedDocumentsMenu({
 	typeCounts,
 	activeTypes,
 	onToggleType,
@@ -159,7 +160,7 @@ function EmbeddedDocumentsMenu({
 					className="relative h-7 w-7 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 					aria-label="Document actions"
 				>
-					<MoreHorizontal className="h-3.5 w-3.5" />
+					<SlidersVertical className="h-3.5 w-3.5" />
 					{activeTypes.length > 0 ? (
 						<span className="absolute right-0.5 top-0.5 h-1.5 w-1.5 rounded-full bg-primary" />
 					) : null}
@@ -1555,17 +1556,22 @@ function AuthenticatedDocumentsSidebarBase({
 
 	if (embedded) {
 		return (
-			<div className="flex h-full min-h-0 flex-col text-sidebar-foreground">
-				<div className="flex shrink-0 justify-end px-2 pb-1">
+			<SidebarSection
+				title={t("title") || "Documents"}
+				defaultOpen={true}
+				fillHeight
+				contentClassName="px-0"
+				persistentAction={
 					<EmbeddedDocumentsMenu
 						typeCounts={typeCounts}
 						activeTypes={activeTypes}
 						onToggleType={onToggleType}
 						onCreateFolder={() => handleCreateFolder(null)}
 					/>
-				</div>
+				}
+			>
 				{renderDocumentTree()}
-			</div>
+			</SidebarSection>
 		);
 	}
 
@@ -1934,15 +1940,20 @@ function AnonymousDocumentsSidebar({
 
 	if (embedded) {
 		return (
-			<div className="flex h-full min-h-0 flex-col text-sidebar-foreground">
-				<div className="flex shrink-0 justify-end px-2 pb-1">
+			<SidebarSection
+				title={t("title") || "Documents"}
+				defaultOpen={true}
+				fillHeight
+				contentClassName="px-0"
+				persistentAction={
 					<EmbeddedDocumentsMenu
 						typeCounts={hasDoc ? { FILE: 1 } : {}}
 						activeTypes={[]}
 						onToggleType={() => {}}
 						onCreateFolder={() => gate("create folders")}
 					/>
-				</div>
+				}
+			>
 				<FolderTreeView
 					folders={[]}
 					documents={treeDocuments}
@@ -1973,7 +1984,7 @@ function AnonymousDocumentsSidebar({
 					onStopWatchingFolder={() => gate("watch local folders")}
 					onExportFolder={() => gate("export folders")}
 				/>
-			</div>
+			</SidebarSection>
 		);
 	}
 
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 1ad370fab..6477e27a8 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -336,18 +336,13 @@ export function Sidebar({
 						)}
 					</SidebarSection>
 					{documentsPanel?.open ? (
-						<SidebarSection
-							title={documentsItem?.title ?? "Documents"}
-							defaultOpen={true}
-							fillHeight
-							contentClassName="px-0"
-						>
+						<div className="min-h-0 flex flex-1 flex-col">
 							<DocumentsSidebar
 								open={documentsPanel.open}
 								onOpenChange={documentsPanel.onOpenChange}
 								embedded
 							/>
-						</SidebarSection>
+						</div>
 					) : null}
 				</div>
 			)}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index 573173cf5..ac995094a 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -41,7 +41,7 @@ export function SidebarSection({
 				className
 			)}
 		>
-			<div className="flex items-center group/section shrink-0 px-4 py-1">
+			<div className="flex items-center group/section shrink-0 pl-4 pr-2.5 py-1">
 				<CollapsibleTrigger className="flex items-center gap-1 text-xs font-medium text-muted-foreground hover:text-accent-foreground transition-colors min-w-0">
 					<span className="truncate">{title}</span>
 					<ChevronRight
@@ -66,7 +66,15 @@ export function SidebarSection({
 				)}
 
 				{persistentAction && (
-					<div className="shrink-0 ml-auto flex items-center">{persistentAction}</div>
+					<div
+						className={cn(
+							"shrink-0 ml-auto flex items-center transition-opacity",
+							isOpen ? "opacity-100" : "pointer-events-none opacity-0"
+						)}
+						aria-hidden={!isOpen}
+					>
+						{persistentAction}
+					</div>
 				)}
 			</div>