diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index 2693013ef..fcce90e9c 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -79,6 +79,12 @@ export const useConnectorDialog = () => {
 		connectorType: string;
 		connectorTitle: string;
 	} | null>(null);
+	
+	// Track if we came from accounts list when entering edit mode
+	const [cameFromAccountsList, setCameFromAccountsList] = useState<{
+		connectorType: string;
+		connectorTitle: string;
+	} | null>(null);
 
 	// Helper function to get frequency label
 	const getFrequencyLabel = useCallback((minutes: string): string => {
@@ -960,6 +966,14 @@ export const useConnectorDialog = () => {
 				return;
 			}
 
+			// Track if we came from accounts list view
+			// If viewingAccountsType matches this connector type, preserve it
+			if (viewingAccountsType && viewingAccountsType.connectorType === connector.connector_type) {
+				setCameFromAccountsList(viewingAccountsType);
+			} else {
+				setCameFromAccountsList(null);
+			}
+
 			// Track index with date range opened event
 			if (connector.is_indexable) {
 				trackIndexWithDateRangeOpened(
@@ -989,7 +1003,7 @@ export const useConnectorDialog = () => {
 			url.searchParams.set("connectorId", connector.id.toString());
 			window.history.pushState({ modal: true }, "", url.toString());
 		},
-		[searchSpaceId]
+		[searchSpaceId, viewingAccountsType]
 	);
 
 	// Handle saving connector changes
@@ -1252,13 +1266,30 @@ export const useConnectorDialog = () => {
 
 	// Handle going back from edit view
 	const handleBackFromEdit = useCallback(() => {
-		const url = new URL(window.location.href);
-		url.searchParams.set("modal", "connectors");
-		url.searchParams.set("tab", "all");
-		url.searchParams.delete("view");
-		url.searchParams.delete("connectorId");
-		router.replace(url.pathname + url.search, { scroll: false });
-	}, [router]);
+		// If we came from accounts list view, go back there
+		if (cameFromAccountsList && editingConnector) {
+			// Restore accounts list view
+			setViewingAccountsType(cameFromAccountsList);
+			setCameFromAccountsList(null);
+			const url = new URL(window.location.href);
+			url.searchParams.set("modal", "connectors");
+			url.searchParams.set("view", "accounts");
+			url.searchParams.set("connectorType", cameFromAccountsList.connectorType);
+			url.searchParams.delete("connectorId");
+			router.replace(url.pathname + url.search, { scroll: false });
+		} else {
+			// Otherwise, go back to main connector popup
+			const url = new URL(window.location.href);
+			url.searchParams.set("modal", "connectors");
+			url.searchParams.set("tab", "all");
+			url.searchParams.delete("view");
+			url.searchParams.delete("connectorId");
+			router.replace(url.pathname + url.search, { scroll: false });
+		}
+		setEditingConnector(null);
+		setConnectorName(null);
+		setConnectorConfig(null);
+	}, [router, cameFromAccountsList, editingConnector]);
 
 	// Handle dialog open/close
 	const handleOpenChange = useCallback(
@@ -1289,6 +1320,7 @@ export const useConnectorDialog = () => {
 					setConnectorConfig(null);
 					setConnectingConnectorType(null);
 					setViewingAccountsType(null);
+					setCameFromAccountsList(null);
 					setStartDate(undefined);
 					setEndDate(undefined);
 					setPeriodicEnabled(false);
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index e45f24d11..141de0848 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -71,27 +71,30 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 	return (
 		<div className="flex flex-col h-full">
 			{/* Header */}
-			<div className="px-4 sm:px-12 pt-6 sm:pt-10 pb-4 border-b border-border/50 bg-muted">
-				<div className="flex items-center justify-between gap-4 sm:pr-4">
-					<div className="flex items-center gap-4">
-						<Button
-							variant="ghost"
-							size="icon"
-							className="size-8 rounded-full shrink-0"
-							onClick={onBack}
-						>
-							<ArrowLeft className="size-4" />
-						</Button>
-						<div className="flex items-center gap-3">
-							<div className="flex h-10 w-10 items-center justify-center rounded-lg bg-slate-400/5 dark:bg-white/5 border border-slate-400/5 dark:border-white/5">
-								{getConnectorIcon(connectorType, "size-5")}
-							</div>
-							<div>
-								<h2 className="text-lg font-semibold">{connectorTitle} Accounts</h2>
-								<p className="text-xs text-muted-foreground">
-									{typeConnectors.length} connected account{typeConnectors.length !== 1 ? "s" : ""}
-								</p>
-							</div>
+			<div className="px-6 sm:px-12 pt-8 sm:pt-10 pb-4 border-b border-border/50 bg-muted">
+				{/* Back button */}
+				<button
+					type="button"
+					onClick={onBack}
+					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+				>
+					<ArrowLeft className="size-4" />
+					Back to connectors
+				</button>
+
+				{/* Connector header */}
+				<div className="flex flex-col sm:flex-row items-start sm:items-center gap-4 mb-6">
+					<div className="flex gap-4 flex-1 w-full sm:w-auto">
+						<div className="flex h-14 w-14 items-center justify-center rounded-xl bg-primary/10 border border-primary/20 shrink-0">
+							{getConnectorIcon(connectorType, "size-7")}
+						</div>
+						<div className="flex-1 min-w-0">
+							<h2 className="text-xl sm:text-2xl font-semibold tracking-tight text-wrap whitespace-normal">
+								{connectorTitle}
+							</h2>
+							<p className="text-xs sm:text-base text-muted-foreground mt-1">
+								Manage your connector settings and sync configuration
+							</p>
 						</div>
 					</div>
 					{/* Add Account Button with dashed border */}
@@ -100,7 +103,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 						onClick={onAddAccount}
 						disabled={isConnecting}
 						className={cn(
-							"flex items-center gap-2 px-3 py-2 rounded-lg mr-4 border-2 border-dashed border-border/70 text-left transition-all duration-200",
+							"flex items-center gap-2 px-3 py-2 rounded-lg border-2 border-dashed border-border/70 text-left transition-all duration-200 shrink-0 self-center sm:self-auto sm:w-auto",
 							"border-primary/50 hover:bg-primary/5",
 							isConnecting && "opacity-50 cursor-not-allowed"
 						)}
@@ -120,7 +123,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 			</div>
 
 			{/* Content */}
-			<div className="flex-1 overflow-y-auto px-4 sm:px-12 py-6 sm:py-8">
+			<div className="flex-1 overflow-y-auto px-6 sm:px-12 py-6 sm:py-8">
 				{/* Connected Accounts Grid */}
 				<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
 					{typeConnectors.map((connector) => {