diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 047a970a5..7d7145962 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -37,9 +37,9 @@ import {
 import { Input } from "@/components/ui/input";
 import { isPageLimitExceededMetadata } from "@/contracts/types/inbox.types";
 import { useAnnouncements } from "@/hooks/use-announcements";
-import { useIsMobile } from "@/hooks/use-mobile";
 import { useDocumentsProcessing } from "@/hooks/use-documents-processing";
 import { useInbox } from "@/hooks/use-inbox";
+import { useIsMobile } from "@/hooks/use-mobile";
 import { notificationsApiService } from "@/lib/apis/notifications-api.service";
 import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
 import { logout } from "@/lib/auth-utils";
@@ -316,13 +316,15 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				isActive: isInboxSidebarOpen,
 				badge: totalUnreadCount > 0 ? formatInboxCount(totalUnreadCount) : undefined,
 			},
-		{
-			title: "Documents",
-			url: "#documents",
-			icon: SquareLibrary,
-			isActive: isMobile ? isDocumentsSidebarOpen : (isDocumentsSidebarOpen && !isRightPanelCollapsed),
-			statusIndicator: documentsProcessingStatus,
-		},
+			{
+				title: "Documents",
+				url: "#documents",
+				icon: SquareLibrary,
+				isActive: isMobile
+					? isDocumentsSidebarOpen
+					: isDocumentsSidebarOpen && !isRightPanelCollapsed,
+				statusIndicator: documentsProcessingStatus,
+			},
 			{
 				title: "Announcements",
 				url: "#announcements",
@@ -331,16 +333,16 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				badge: announcementUnreadCount > 0 ? formatInboxCount(announcementUnreadCount) : undefined,
 			},
 		],
-	[
-		isMobile,
-		isInboxSidebarOpen,
-		isDocumentsSidebarOpen,
-		isRightPanelCollapsed,
-		totalUnreadCount,
-		isAnnouncementsSidebarOpen,
-		announcementUnreadCount,
-		documentsProcessingStatus,
-	]
+		[
+			isMobile,
+			isInboxSidebarOpen,
+			isDocumentsSidebarOpen,
+			isRightPanelCollapsed,
+			totalUnreadCount,
+			isAnnouncementsSidebarOpen,
+			announcementUnreadCount,
+			documentsProcessingStatus,
+		]
 	);
 
 	// Handlers
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 232518ba7..0c812d88f 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -54,8 +54,8 @@ export function RightPanelExpandButton() {
 					<Button
 						variant="ghost"
 						size="icon"
-					onClick={() => startTransition(() => setCollapsed(false))}
-					className="h-8 w-8 shrink-0"
+						onClick={() => startTransition(() => setCollapsed(false))}
+						className="h-8 w-8 shrink-0"
 					>
 						<PanelRight className="h-4 w-4" />
 						<span className="sr-only">Expand panel</span>
@@ -109,57 +109,57 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	return (
 		<AnimatePresence>
 			{isVisible && (
-			<motion.aside
-				key="right-panel"
-				initial={{ width: 0, opacity: 0 }}
-				animate={{ width: targetWidth, opacity: 1 }}
-				exit={{ width: 0, opacity: 0 }}
-				transition={{
-					width: { type: "spring", stiffness: 400, damping: 35, mass: 0.8 },
-					opacity: { duration: 0.2, ease: "easeOut" },
-				}}
-				style={{ willChange: "width, opacity", contain: "layout style" }}
-				className="flex h-full shrink-0 flex-col border-l bg-background overflow-hidden"
-			>
-				<div className="relative flex-1 min-h-0 overflow-hidden">
-					<AnimatePresence mode="popLayout" initial={false}>
-						{contentKey === "sources" && documentsPanel && (
-							<motion.div
-								key="sources"
-								initial={{ opacity: 0, x: 8 }}
-								animate={{ opacity: 1, x: 0 }}
-								exit={{ opacity: 0, x: -8 }}
-								transition={{ duration: 0.15, ease: "easeOut" }}
-								className="h-full"
-							>
-								<DocumentsSidebar
-									open={documentsPanel.open}
-									onOpenChange={documentsPanel.onOpenChange}
-									embedded
-									headerAction={collapseButton}
-								/>
-							</motion.div>
-						)}
-						{contentKey === "report" && (
-							<motion.div
-								key="report"
-								initial={{ opacity: 0, x: 8 }}
-								animate={{ opacity: 1, x: 0 }}
-								exit={{ opacity: 0, x: -8 }}
-								transition={{ duration: 0.15, ease: "easeOut" }}
-								className="h-full"
-							>
-								<div className="flex h-full flex-col">
-									<ReportPanelContent
-										reportId={reportState.reportId!}
-										title={reportState.title || "Report"}
-										onClose={closeReport}
-										shareToken={reportState.shareToken}
+				<motion.aside
+					key="right-panel"
+					initial={{ width: 0, opacity: 0 }}
+					animate={{ width: targetWidth, opacity: 1 }}
+					exit={{ width: 0, opacity: 0 }}
+					transition={{
+						width: { type: "spring", stiffness: 400, damping: 35, mass: 0.8 },
+						opacity: { duration: 0.2, ease: "easeOut" },
+					}}
+					style={{ willChange: "width, opacity", contain: "layout style" }}
+					className="flex h-full shrink-0 flex-col border-l bg-background overflow-hidden"
+				>
+					<div className="relative flex-1 min-h-0 overflow-hidden">
+						<AnimatePresence mode="popLayout" initial={false}>
+							{contentKey === "sources" && documentsPanel && (
+								<motion.div
+									key="sources"
+									initial={{ opacity: 0, x: 8 }}
+									animate={{ opacity: 1, x: 0 }}
+									exit={{ opacity: 0, x: -8 }}
+									transition={{ duration: 0.15, ease: "easeOut" }}
+									className="h-full"
+								>
+									<DocumentsSidebar
+										open={documentsPanel.open}
+										onOpenChange={documentsPanel.onOpenChange}
+										embedded
+										headerAction={collapseButton}
 									/>
-								</div>
-							</motion.div>
-						)}
-					</AnimatePresence>
+								</motion.div>
+							)}
+							{contentKey === "report" && (
+								<motion.div
+									key="report"
+									initial={{ opacity: 0, x: 8 }}
+									animate={{ opacity: 1, x: 0 }}
+									exit={{ opacity: 0, x: -8 }}
+									transition={{ duration: 0.15, ease: "easeOut" }}
+									className="h-full"
+								>
+									<div className="flex h-full flex-col">
+										<ReportPanelContent
+											reportId={reportState.reportId!}
+											title={reportState.title || "Report"}
+											onClose={closeReport}
+											shareToken={reportState.shareToken}
+										/>
+									</div>
+								</motion.div>
+							)}
+						</AnimatePresence>
 					</div>
 				</motion.aside>
 			)}
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index df8d7a04b..eae6fcad8 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -277,38 +277,42 @@ export function LayoutShell({
 
 					{/* Main container with sidebar and content - relative for inbox positioning */}
 					<div className="relative flex flex-1 rounded-xl border bg-background overflow-hidden">
-					<Sidebar
-						searchSpace={searchSpace}
-						isCollapsed={isCollapsed}
-						onToggleCollapse={toggleCollapsed}
-						navItems={navItems}
-						onNavItemClick={onNavItemClick}
-						chats={chats}
-						sharedChats={sharedChats}
-						activeChatId={activeChatId}
-						onNewChat={onNewChat}
-						onChatSelect={onChatSelect}
-						onChatRename={onChatRename}
-						onChatDelete={onChatDelete}
-						onChatArchive={onChatArchive}
-						onViewAllSharedChats={onViewAllSharedChats}
-						onViewAllPrivateChats={onViewAllPrivateChats}
-						user={user}
-						onSettings={onSettings}
-						onManageMembers={onManageMembers}
-						onUserSettings={onUserSettings}
-						onLogout={onLogout}
-						pageUsage={pageUsage}
-						theme={theme}
-						setTheme={setTheme}
-						className="hidden md:flex border-r shrink-0"
-						isLoadingChats={isLoadingChats}
-						sidebarWidth={sidebarWidth}
-						onResizeMouseDown={onResizeMouseDown}
-						isResizing={isResizing}
-					/>
+						<Sidebar
+							searchSpace={searchSpace}
+							isCollapsed={isCollapsed}
+							onToggleCollapse={toggleCollapsed}
+							navItems={navItems}
+							onNavItemClick={onNavItemClick}
+							chats={chats}
+							sharedChats={sharedChats}
+							activeChatId={activeChatId}
+							onNewChat={onNewChat}
+							onChatSelect={onChatSelect}
+							onChatRename={onChatRename}
+							onChatDelete={onChatDelete}
+							onChatArchive={onChatArchive}
+							onViewAllSharedChats={onViewAllSharedChats}
+							onViewAllPrivateChats={onViewAllPrivateChats}
+							user={user}
+							onSettings={onSettings}
+							onManageMembers={onManageMembers}
+							onUserSettings={onUserSettings}
+							onLogout={onLogout}
+							pageUsage={pageUsage}
+							theme={theme}
+							setTheme={setTheme}
+							className="hidden md:flex border-r shrink-0"
+							isLoadingChats={isLoadingChats}
+							sidebarWidth={sidebarWidth}
+							onResizeMouseDown={onResizeMouseDown}
+							isResizing={isResizing}
+						/>
 
-						<motion.main layout="position" style={{ contain: "inline-size" }} className="flex-1 flex flex-col min-w-0">
+						<motion.main
+							layout="position"
+							style={{ contain: "inline-size" }}
+							className="flex-1 flex flex-col min-w-0"
+						>
 							<Header />
 
 							<div className={cn("flex-1", isChatPage ? "overflow-hidden" : "overflow-auto")}>
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index f516c0a64..bcb7a8f28 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -178,8 +178,8 @@ export function DocumentsSidebar({
 
 	const documentsContent = (
 		<>
-		<div className="shrink-0 flex h-14 items-center px-4">
-			<div className="flex w-full items-center justify-between">
+			<div className="shrink-0 flex h-14 items-center px-4">
+				<div className="flex w-full items-center justify-between">
 					<div className="flex items-center gap-2">
 						{isMobile && (
 							<Button