diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/airtable-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/airtable-connector/page.tsx
index 7ebbeec3f..cc4330203 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/airtable-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/airtable-connector/page.tsx
@@ -123,7 +123,7 @@ export default function AirtableConnectorPage() {
 							<Button
 								type="button"
 								variant="outline"
-								onClick={() => router.back()}
+								onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 							>
 								Cancel
 							</Button>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/baidu-search-api/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/baidu-search-api/page.tsx
index e1a84a8ab..3e9f4898e 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/baidu-search-api/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/baidu-search-api/page.tsx
@@ -126,7 +126,7 @@ export default function BaiduSearchApiPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/bookstack-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/bookstack-connector/page.tsx
index eff10c281..576fa4ebc 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/bookstack-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/bookstack-connector/page.tsx
@@ -102,7 +102,7 @@ export default function BookStackConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/clickup-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/clickup-connector/page.tsx
index b99478dc5..2d5f6954c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/clickup-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/clickup-connector/page.tsx
@@ -89,7 +89,7 @@ export default function ClickUpConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/confluence-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/confluence-connector/page.tsx
index 2f03cd3fe..c625f8900 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/confluence-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/confluence-connector/page.tsx
@@ -112,7 +112,7 @@ export default function ConfluenceConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/discord-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/discord-connector/page.tsx
index 3210581e2..1daa6bcd0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/discord-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/discord-connector/page.tsx
@@ -104,7 +104,7 @@ export default function DiscordConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/elasticsearch-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/elasticsearch-connector/page.tsx
index 8ed4f398f..e417995ed 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/elasticsearch-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/elasticsearch-connector/page.tsx
@@ -202,7 +202,7 @@ export default function ElasticsearchConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/github-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/github-connector/page.tsx
index a7cc1ac84..833d716a8 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/github-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/github-connector/page.tsx
@@ -192,7 +192,7 @@ export default function GithubConnectorPage() {
 						// Reset form PAT field, keep name
 						form.reset({ name: connectorName, github_pat: "" });
 					} else {
-						router.back();
+						router.push(`/dashboard/${searchSpaceId}/connectors/add`);
 					}
 				}}
 			>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-calendar-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-calendar-connector/page.tsx
index 47785a84f..8179fbabc 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-calendar-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-calendar-connector/page.tsx
@@ -130,7 +130,7 @@ export default function GoogleCalendarConnectorPage() {
 							<Button
 								type="button"
 								variant="outline"
-								onClick={() => router.back()}
+								onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 							>
 								Cancel
 							</Button>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-gmail-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-gmail-connector/page.tsx
index 41b9e42f8..8659d937c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-gmail-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-gmail-connector/page.tsx
@@ -133,7 +133,7 @@ export default function GoogleGmailConnectorPage() {
 							<Button
 								type="button"
 								variant="outline"
-								onClick={() => router.back()}
+								onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 							>
 								Cancel
 							</Button>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/jira-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/jira-connector/page.tsx
index 132c58521..6f4e31114 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/jira-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/jira-connector/page.tsx
@@ -125,7 +125,7 @@ export default function JiraConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linear-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linear-connector/page.tsx
index 53fb69ca8..13df9a910 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linear-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linear-connector/page.tsx
@@ -110,7 +110,7 @@ export default function LinearConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linkup-api/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linkup-api/page.tsx
index 15bf65043..c20c2b576 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linkup-api/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/linkup-api/page.tsx
@@ -98,7 +98,7 @@ export default function LinkupApiPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/luma-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/luma-connector/page.tsx
index ba847cb50..7d4b82b68 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/luma-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/luma-connector/page.tsx
@@ -211,7 +211,7 @@ export default function LumaConnectorPage() {
 									<Button
 										type="button"
 										variant="outline"
-										onClick={() => router.back()}
+										onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 									>
 										Cancel
 									</Button>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/notion-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/notion-connector/page.tsx
index 5cfd16a5f..310c31811 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/notion-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/notion-connector/page.tsx
@@ -105,7 +105,7 @@ export default function NotionConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/searxng/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/searxng/page.tsx
index ce38dd6ba..9645a3657 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/searxng/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/searxng/page.tsx
@@ -144,7 +144,7 @@ export default function SearxngConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/slack-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/slack-connector/page.tsx
index 7dc27156f..314ed8442 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/slack-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/slack-connector/page.tsx
@@ -105,7 +105,7 @@ export default function SlackConnectorPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/tavily-api/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/tavily-api/page.tsx
index 12539b9e9..40b98ca5c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/tavily-api/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/tavily-api/page.tsx
@@ -98,7 +98,7 @@ export default function TavilyApiPage() {
 			<Button
 				variant="ghost"
 				className="mb-6"
-				onClick={() => router.back()}
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 			>
 				<ArrowLeft className="mr-2 h-4 w-4" />
 				Back to Connectors
diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/webcrawler-connector/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/webcrawler-connector/page.tsx
index 94f15f7c0..8edc34728 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/add/webcrawler-connector/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/add/webcrawler-connector/page.tsx
@@ -249,7 +249,7 @@ export default function WebcrawlerConnectorPage() {
 									<Button
 										type="button"
 										variant="outline"
-										onClick={() => router.back()}
+										onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
 									>
 										Cancel
 									</Button>
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 1296ab28f..30e2a42d9 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -36,7 +36,6 @@ import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-quer
 import { useSearchSourceConnectors } from "@/hooks/use-search-source-connectors";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { connectorCategories } from "@/components/sources/connector-data";
 import {
 	ComposerAddAttachment,
 	ComposerAttachments,
@@ -326,57 +325,10 @@ const ConnectorIndicator: FC = () => {
 	const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
 	const { connectors, isLoading } = useSearchSourceConnectors(false, searchSpaceId ? Number(searchSpaceId) : undefined);
 	const [isOpen, setIsOpen] = useState(false);
-	const [searchQuery, setSearchQuery] = useState("");
 	const closeTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 	
 	const hasConnectors = connectors.length > 0;
 	
-	// Get connected connector types for comparison
-	const connectedTypes = new Set(connectors.map(c => c.connector_type));
-	
-	// Flatten all available connectors from categories
-	const allAvailableConnectors = connectorCategories.flatMap(category => 
-		category.connectors.filter(c => c.status === "available")
-	);
-	
-	// Filter connectors based on search query
-	const filteredConnectors = allAvailableConnectors.filter(connector =>
-		connector.title.toLowerCase().includes(searchQuery.toLowerCase())
-	);
-	
-	// Filter connected connectors based on search query
-	const filteredConnectedConnectors = connectors.filter(connector =>
-		connector.name.toLowerCase().includes(searchQuery.toLowerCase())
-	);
-	
-	// Filter available (not connected) connectors
-	const filteredAvailableConnectors = filteredConnectors.filter(connector => {
-		// Map connector id to connector_type for comparison
-		const connectorTypeMap: Record<string, string> = {
-			"webcrawler-connector": "WEBCRAWLER_CONNECTOR",
-			"tavily-api": "TAVILY_API",
-			"searxng": "SEARXNG_API",
-			"linkup-api": "LINKUP_API",
-			"baidu-search-api": "BAIDU_SEARCH_API",
-			"slack-connector": "SLACK_CONNECTOR",
-			"discord-connector": "DISCORD_CONNECTOR",
-			"linear-connector": "LINEAR_CONNECTOR",
-			"jira-connector": "JIRA_CONNECTOR",
-			"clickup-connector": "CLICKUP_CONNECTOR",
-			"notion-connector": "NOTION_CONNECTOR",
-			"confluence-connector": "CONFLUENCE_CONNECTOR",
-			"bookstack-connector": "BOOKSTACK_CONNECTOR",
-			"github-connector": "GITHUB_CONNECTOR",
-			"elasticsearch-connector": "ELASTICSEARCH_CONNECTOR",
-			"airtable-connector": "AIRTABLE_CONNECTOR",
-			"google-calendar-connector": "GOOGLE_CALENDAR_CONNECTOR",
-			"google-gmail-connector": "GOOGLE_GMAIL_CONNECTOR",
-			"luma-connector": "LUMA_CONNECTOR",
-		};
-		const connectorType = connectorTypeMap[connector.id];
-		return !connectorType || !connectedTypes.has(connectorType);
-	});
-	
 	const handleMouseEnter = useCallback(() => {
 		// Clear any pending close timeout
 		if (closeTimeoutRef.current) {
@@ -390,7 +342,6 @@ const ConnectorIndicator: FC = () => {
 		// Delay closing by 150ms for better UX
 		closeTimeoutRef.current = setTimeout(() => {
 			setIsOpen(false);
-			setSearchQuery(""); // Reset search when closing
 		}, 150);
 	}, []);
 	
@@ -425,75 +376,48 @@ const ConnectorIndicator: FC = () => {
 			<PopoverContent 
 				side="bottom" 
 				align="start" 
-				className="w-72 p-0"
+				className="w-64 p-3"
 				onMouseEnter={handleMouseEnter}
 				onMouseLeave={handleMouseLeave}
 			>
-				<div className="flex flex-col max-h-[250px] overflow-hidden rounded-md">
-					{/* Search input - sticky at top */}
-					<div className="p-2 border-b sticky top-0 bg-popover z-10 rounded-t-md">
-						<div className="relative">
-							<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 size-3.5 text-muted-foreground" />
-							<input
-								type="text"
-								placeholder="Search connectors..."
-								value={searchQuery}
-								onChange={(e) => setSearchQuery(e.target.value)}
-								className="w-full pl-8 pr-3 py-1.5 text-sm bg-transparent border-none outline-none focus:ring-0 placeholder:text-muted-foreground"
-							/>
-						</div>
-					</div>
-					
-					{/* Connectors list - scrollable */}
-					<div className="overflow-y-auto flex-1 p-1">
-						{/* Connected connectors first */}
-						{filteredConnectedConnectors.length > 0 && (
-							<>
-								{filteredConnectedConnectors.map((connector) => (
-									<Link
-										key={connector.id}
-										href={`/dashboard/${searchSpaceId}/connectors/${connector.id}`}
-										className="flex items-center justify-between px-2 py-2 rounded-md hover:bg-muted transition-colors group"
-									>
-										<div className="flex items-center gap-2.5">
-											<div className="size-6 flex items-center justify-center text-muted-foreground">
-												{getConnectorIcon(connector.connector_type, "size-5")}
-											</div>
-											<span className="text-sm">{connector.name}</span>
-										</div>
-										<CheckCircle2 className="size-4 text-emerald-500" />
-									</Link>
-								))}
-								{filteredAvailableConnectors.length > 0 && (
-									<div className="border-t my-1" />
-								)}
-							</>
-						)}
-						
-						{/* Available connectors */}
-						{filteredAvailableConnectors.length > 0 ? (
-							filteredAvailableConnectors.map((connector) => (
-								<Link
+				{hasConnectors ? (
+					<div className="space-y-2">
+						<p className="text-xs font-medium text-muted-foreground mb-2">
+							Connected Sources ({connectors.length})
+						</p>
+						<div className="flex flex-wrap gap-2">
+							{connectors.map((connector) => (
+								<div
 									key={connector.id}
-									href={`/dashboard/${searchSpaceId}/connectors/add/${connector.id}`}
-									className="flex items-center justify-between px-2 py-2 rounded-md hover:bg-muted transition-colors group"
+									className="flex items-center gap-1.5 rounded-md bg-muted px-2 py-1 text-xs"
 								>
-									<div className="flex items-center gap-2.5">
-										<div className="size-6 flex items-center justify-center text-muted-foreground">
-											{connector.icon}
-										</div>
-										<span className="text-sm">{connector.title}</span>
-									</div>
-									<Plus className="size-4 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
-								</Link>
-							))
-						) : filteredConnectedConnectors.length === 0 ? (
-							<div className="px-2 py-4 text-center text-sm text-muted-foreground">
-								No connectors found
-							</div>
-						) : null}
+									{getConnectorIcon(connector.connector_type, "size-3")}
+									<span className="truncate max-w-[100px]">{connector.name}</span>
+								</div>
+							))}
+						</div>
+						<Link
+							href={`/dashboard/${searchSpaceId}/connectors`}
+							className="block text-xs text-primary hover:underline mt-2"
+						>
+							Manage connectors →
+						</Link>
 					</div>
-				</div>
+				) : (
+					<div className="space-y-2">
+						<p className="text-sm font-medium">No connectors yet</p>
+						<p className="text-xs text-muted-foreground">
+							Connect your first data source to enhance search results.
+						</p>
+						<Link
+							href={`/dashboard/${searchSpaceId}/connectors/add`}
+							className="inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 transition-colors mt-1"
+						>
+							<Plus className="size-3" />
+							Add Connector
+						</Link>
+					</div>
+				)}
 			</PopoverContent>
 		</Popover>
 	);