diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index d182317e4..daf85bec9 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -20,7 +20,7 @@ import { CreateFolderDialog } from "@/components/documents/CreateFolderDialog";
 import type { DocumentNodeDoc } from "@/components/documents/DocumentNode";
 import type { FolderDisplay } from "@/components/documents/FolderNode";
 import { FolderPickerDialog } from "@/components/documents/FolderPickerDialog";
-import { FolderWatchDialog } from "@/components/sources/FolderWatchDialog";
+import { FolderWatchDialog, type SelectedFolder } from "@/components/sources/FolderWatchDialog";
 import { FolderTreeView } from "@/components/documents/FolderTreeView";
 import { VersionHistoryDialog } from "@/components/documents/version-history";
 import { EXPORT_FILE_EXTENSIONS } from "@/components/shared/ExportMenuItems";
@@ -97,8 +97,22 @@ export function DocumentsSidebar({
 	const [activeTypes, setActiveTypes] = useState<DocumentTypeEnum[]>([]);
 	const [watchedFolderIds, setWatchedFolderIds] = useState<Set<number>>(new Set());
 	const [folderWatchOpen, setFolderWatchOpen] = useState(false);
+	const [watchInitialFolder, setWatchInitialFolder] = useState<SelectedFolder | null>(null);
 	const isElectron = typeof window !== "undefined" && !!window.electronAPI;
 
+	const handleWatchLocalFolder = useCallback(async () => {
+		const api = window.electronAPI;
+		if (!api?.selectFolder) return;
+
+		const folderPath = await api.selectFolder();
+		if (!folderPath) return;
+
+		const folderName =
+			folderPath.split("/").pop() || folderPath.split("\\").pop() || folderPath;
+		setWatchInitialFolder({ path: folderPath, name: folderName });
+		setFolderWatchOpen(true);
+	}, []);
+
 	useEffect(() => {
 		const api = typeof window !== "undefined" ? window.electronAPI : null;
 		if (!api?.getWatchedFolders) return;
@@ -754,7 +768,7 @@ export function DocumentsSidebar({
 			{isElectron && (
 				<button
 					type="button"
-					onClick={() => setFolderWatchOpen(true)}
+					onClick={handleWatchLocalFolder}
 					className="shrink-0 mx-4 mb-4 flex select-none items-center gap-2 rounded-lg border bg-muted/50 px-3 py-2 transition-colors hover:bg-muted/80"
 				>
 					<FolderClock className="size-4 shrink-0 text-muted-foreground" />
@@ -843,8 +857,12 @@ export function DocumentsSidebar({
 			{isElectron && (
 				<FolderWatchDialog
 					open={folderWatchOpen}
-					onOpenChange={setFolderWatchOpen}
+					onOpenChange={(nextOpen) => {
+						setFolderWatchOpen(nextOpen);
+						if (!nextOpen) setWatchInitialFolder(null);
+					}}
 					searchSpaceId={searchSpaceId}
+					initialFolder={watchInitialFolder}
 				/>
 			)}
 
diff --git a/surfsense_web/components/sources/FolderWatchDialog.tsx b/surfsense_web/components/sources/FolderWatchDialog.tsx
index e1911b966..6f0caa66d 100644
--- a/surfsense_web/components/sources/FolderWatchDialog.tsx
+++ b/surfsense_web/components/sources/FolderWatchDialog.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { FolderOpen, X } from "lucide-react";
-import { useCallback, useMemo, useState } from "react";
+import { X } from "lucide-react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
 import {
@@ -16,7 +16,7 @@ import { Switch } from "@/components/ui/switch";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { getSupportedExtensionsSet } from "@/lib/supported-extensions";
 
-interface SelectedFolder {
+export interface SelectedFolder {
 	path: string;
 	name: string;
 }
@@ -26,6 +26,7 @@ interface FolderWatchDialogProps {
 	onOpenChange: (open: boolean) => void;
 	searchSpaceId: number;
 	onSuccess?: () => void;
+	initialFolder?: SelectedFolder | null;
 }
 
 const DEFAULT_EXCLUDE_PATTERNS = [
@@ -42,11 +43,18 @@ export function FolderWatchDialog({
 	onOpenChange,
 	searchSpaceId,
 	onSuccess,
+	initialFolder,
 }: FolderWatchDialogProps) {
 	const [selectedFolder, setSelectedFolder] = useState<SelectedFolder | null>(null);
 	const [shouldSummarize, setShouldSummarize] = useState(false);
 	const [submitting, setSubmitting] = useState(false);
 
+	useEffect(() => {
+		if (open && initialFolder) {
+			setSelectedFolder(initialFolder);
+		}
+	}, [open, initialFolder]);
+
 	const supportedExtensions = useMemo(
 		() => Array.from(getSupportedExtensionsSet()),
 		[]
@@ -117,7 +125,7 @@ export function FolderWatchDialog({
 
 	return (
 		<Dialog open={open} onOpenChange={handleOpenChange}>
-			<DialogContent className="sm:max-w-md">
+			<DialogContent className="sm:max-w-md select-none">
 				<DialogHeader>
 					<DialogTitle>Watch Local Folder</DialogTitle>
 					<DialogDescription>
@@ -127,13 +135,12 @@ export function FolderWatchDialog({
 
 				<div className="space-y-3 pt-2">
 					{selectedFolder ? (
-						<div className="flex items-center gap-2 py-1.5 px-2 rounded-md bg-slate-400/5 dark:bg-white/5">
-							<FolderOpen className="h-4 w-4 text-primary shrink-0" />
-							<div className="min-w-0 flex-1">
-								<p className="text-sm font-medium truncate">
+						<div className="flex items-center gap-2 py-1.5 pl-4 pr-2 rounded-md bg-slate-400/5 dark:bg-white/5 overflow-hidden">
+							<div className="min-w-0 flex-1 select-text">
+								<p className="text-sm font-medium break-all line-clamp-2">
 									{selectedFolder.name}
 								</p>
-								<p className="text-xs text-muted-foreground truncate">
+								<p className="text-xs text-muted-foreground break-all line-clamp-2">
 									{selectedFolder.path}
 								</p>
 							</div>
@@ -178,7 +185,7 @@ export function FolderWatchDialog({
 								disabled={submitting}
 							>
 								<span className={submitting ? "invisible" : ""}>
-									Sync &amp; Watch for Changes
+									Start Folder Sync
 								</span>
 								{submitting && (
 									<span className="absolute inset-0 flex items-center justify-center">