diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index d59835649..e6e9be45d 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -587,10 +587,9 @@ const Composer: FC = () => {
 							/>
 							{/* Popover positioned above input */}
 							<div
-								className="fixed shadow-2xl rounded-lg border border-border overflow-hidden"
+								className="fixed shadow-2xl rounded-lg border border-border overflow-hidden bg-popover"
 								style={{
 									zIndex: 9999,
-									backgroundColor: "#18181b",
 									bottom: editorContainerRef.current
 										? `${window.innerHeight - editorContainerRef.current.getBoundingClientRect().top + 8}px`
 										: "200px",
diff --git a/surfsense_web/components/new-chat/DocumentsDataTable.tsx b/surfsense_web/components/new-chat/DocumentsDataTable.tsx
index 49aeff75c..50b026dfc 100644
--- a/surfsense_web/components/new-chat/DocumentsDataTable.tsx
+++ b/surfsense_web/components/new-chat/DocumentsDataTable.tsx
@@ -183,7 +183,7 @@ export const DocumentsDataTable = forwardRef<DocumentsDataTableRef, DocumentsDat
 
 		return (
 			<div
-				className="flex flex-col w-[280px] sm:w-[320px] bg-zinc-900 rounded-lg"
+				className="flex flex-col w-[280px] sm:w-[320px] bg-popover rounded-lg"
 				onKeyDown={handleKeyDown}
 				role="listbox"
 				tabIndex={-1}