diff --git a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
index 3cd1fffe6..43108c745 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
@@ -17,6 +17,7 @@ export function getDocumentTypeLabel(type: string): string {
 		SLACK_CONNECTOR: "Slack",
 		TEAMS_CONNECTOR: "Microsoft Teams",
 		ONEDRIVE_FILE: "OneDrive",
+		DROPBOX_FILE: "Dropbox",
 		NOTION_CONNECTOR: "Notion",
 		YOUTUBE_VIDEO: "YouTube Video",
 		GITHUB_CONNECTOR: "GitHub",
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 5a35016f5..0a907a474 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -298,10 +298,11 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 							onBack={handleBackFromEdit}
 							onQuickIndex={(() => {
 								const cfg = connectorConfig || editingConnector.config;
-								const isDriveOrOneDrive =
-									editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
-									editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
-									editingConnector.connector_type === "ONEDRIVE_CONNECTOR";
+							const isDriveOrOneDrive =
+								editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
+								editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
+								editingConnector.connector_type === "ONEDRIVE_CONNECTOR" ||
+								editingConnector.connector_type === "DROPBOX_CONNECTOR";
 								const hasDriveItems = isDriveOrOneDrive
 									? ((cfg?.selected_folders as unknown[]) ?? []).length > 0 ||
 										((cfg?.selected_files as unknown[]) ?? []).length > 0
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 e5ce803c1..a2762a029 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
@@ -729,11 +729,12 @@ export const useConnectorDialog = () => {
 		async (refreshConnectors: () => void) => {
 			if (!indexingConfig || !searchSpaceId) return;
 
-			// Validate date range (skip for Google Drive, Composio Drive, OneDrive, and Webcrawler)
+			// Validate date range (skip for Google Drive, Composio Drive, OneDrive, Dropbox, and Webcrawler)
 			if (
 				indexingConfig.connectorType !== "GOOGLE_DRIVE_CONNECTOR" &&
 				indexingConfig.connectorType !== "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" &&
 				indexingConfig.connectorType !== "ONEDRIVE_CONNECTOR" &&
+				indexingConfig.connectorType !== "DROPBOX_CONNECTOR" &&
 				indexingConfig.connectorType !== "WEBCRAWLER_CONNECTOR"
 			) {
 				const dateRangeValidation = dateRangeSchema.safeParse({ startDate, endDate });
@@ -779,11 +780,12 @@ export const useConnectorDialog = () => {
 					});
 				}
 
-				// Handle Google Drive / OneDrive folder selection (regular and Composio)
-				if (
-					(indexingConfig.connectorType === "GOOGLE_DRIVE_CONNECTOR" ||
-						indexingConfig.connectorType === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
-						indexingConfig.connectorType === "ONEDRIVE_CONNECTOR") &&
+			// Handle Google Drive / OneDrive / Dropbox folder selection (regular and Composio)
+			if (
+				(indexingConfig.connectorType === "GOOGLE_DRIVE_CONNECTOR" ||
+					indexingConfig.connectorType === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
+					indexingConfig.connectorType === "ONEDRIVE_CONNECTOR" ||
+					indexingConfig.connectorType === "DROPBOX_CONNECTOR") &&
 					indexingConnectorConfig
 				) {
 					const selectedFolders = indexingConnectorConfig.selected_folders as
@@ -969,11 +971,12 @@ export const useConnectorDialog = () => {
 		async (refreshConnectors: () => void) => {
 			if (!editingConnector || !searchSpaceId || isSaving) return;
 
-			// Validate date range (skip for Google Drive/OneDrive which uses folder selection, Webcrawler which uses config, and non-indexable connectors)
+			// Validate date range (skip for Google Drive/OneDrive/Dropbox which uses folder selection, Webcrawler which uses config, and non-indexable connectors)
 			if (
 				editingConnector.is_indexable &&
 				editingConnector.connector_type !== "GOOGLE_DRIVE_CONNECTOR" &&
 				editingConnector.connector_type !== "ONEDRIVE_CONNECTOR" &&
+				editingConnector.connector_type !== "DROPBOX_CONNECTOR" &&
 				editingConnector.connector_type !== "WEBCRAWLER_CONNECTOR"
 			) {
 				const dateRangeValidation = dateRangeSchema.safeParse({ startDate, endDate });
@@ -989,12 +992,13 @@ export const useConnectorDialog = () => {
 				return;
 			}
 
-			// Prevent periodic indexing for Google Drive / OneDrive (regular or Composio) without folders/files selected
+			// Prevent periodic indexing for Google Drive / OneDrive / Dropbox (regular or Composio) without folders/files selected
 			if (
 				periodicEnabled &&
 				(editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
 					editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
-					editingConnector.connector_type === "ONEDRIVE_CONNECTOR")
+					editingConnector.connector_type === "ONEDRIVE_CONNECTOR" ||
+					editingConnector.connector_type === "DROPBOX_CONNECTOR")
 			) {
 				const selectedFolders = (connectorConfig || editingConnector.config)?.selected_folders as
 					| Array<{ id: string; name: string }>
@@ -1045,12 +1049,13 @@ export const useConnectorDialog = () => {
 				if (!editingConnector.is_indexable) {
 					// Non-indexable connectors (like Tavily API) don't need re-indexing
 					indexingDescription = "Settings saved.";
-				} else if (
-					editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
-					editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
-					editingConnector.connector_type === "ONEDRIVE_CONNECTOR"
-				) {
-					// Google Drive (both regular and Composio) uses folder selection from config, not date ranges
+			} else if (
+				editingConnector.connector_type === "GOOGLE_DRIVE_CONNECTOR" ||
+				editingConnector.connector_type === "COMPOSIO_GOOGLE_DRIVE_CONNECTOR" ||
+				editingConnector.connector_type === "ONEDRIVE_CONNECTOR" ||
+				editingConnector.connector_type === "DROPBOX_CONNECTOR"
+			) {
+				// Google Drive (both regular and Composio) / OneDrive / Dropbox uses folder selection from config, not date ranges
 					const selectedFolders = (connectorConfig || editingConnector.config)?.selected_folders as
 						| Array<{ id: string; name: string }>
 						| undefined;
diff --git a/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts
index aaa479fce..f924bb15f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts
@@ -13,6 +13,7 @@ export const CONNECTOR_TO_DOCUMENT_TYPE: Record<string, string> = {
 	SLACK_CONNECTOR: "SLACK_CONNECTOR",
 	TEAMS_CONNECTOR: "TEAMS_CONNECTOR",
 	ONEDRIVE_CONNECTOR: "ONEDRIVE_FILE",
+	DROPBOX_CONNECTOR: "DROPBOX_FILE",
 	NOTION_CONNECTOR: "NOTION_CONNECTOR",
 	GITHUB_CONNECTOR: "GITHUB_CONNECTOR",
 	LINEAR_CONNECTOR: "LINEAR_CONNECTOR",
diff --git a/surfsense_web/contracts/types/document.types.ts b/surfsense_web/contracts/types/document.types.ts
index 19c730521..1a3326bae 100644
--- a/surfsense_web/contracts/types/document.types.ts
+++ b/surfsense_web/contracts/types/document.types.ts
@@ -8,6 +8,7 @@ export const documentTypeEnum = z.enum([
 	"SLACK_CONNECTOR",
 	"TEAMS_CONNECTOR",
 	"ONEDRIVE_FILE",
+	"DROPBOX_FILE",
 	"NOTION_CONNECTOR",
 	"YOUTUBE_VIDEO",
 	"GITHUB_CONNECTOR",