diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
index 9fa4fc382..ed0e6095c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
@@ -34,6 +34,7 @@ export function MemoryContent() {
 	const [editing, setEditing] = useState(false);
 	const [showInput, setShowInput] = useState(false);
 	const textareaRef = useRef<HTMLInputElement>(null);
+	const inputContainerRef = useRef<HTMLDivElement>(null);
 
 	const fetchMemory = useCallback(async () => {
 		try {
@@ -51,6 +52,26 @@ export function MemoryContent() {
 		fetchMemory();
 	}, [fetchMemory]);
 
+	useEffect(() => {
+		if (!showInput) return;
+
+		const handlePointerDownOutside = (event: MouseEvent | TouchEvent) => {
+			const target = event.target;
+			if (!(target instanceof Node)) return;
+			if (inputContainerRef.current?.contains(target)) return;
+
+			setShowInput(false);
+		};
+
+		document.addEventListener("mousedown", handlePointerDownOutside);
+		document.addEventListener("touchstart", handlePointerDownOutside, { passive: true });
+
+		return () => {
+			document.removeEventListener("mousedown", handlePointerDownOutside);
+			document.removeEventListener("touchstart", handlePointerDownOutside);
+		};
+	}, [showInput]);
+
 	const handleClear = async () => {
 		try {
 			setSaving(true);
@@ -122,9 +143,6 @@ export function MemoryContent() {
 		if (e.key === "Enter" && !e.shiftKey) {
 			e.preventDefault();
 			handleEdit();
-		} else if (e.key === "Escape") {
-			setShowInput(false);
-			setEditQuery("");
 		}
 	};
 
@@ -183,7 +201,10 @@ export function MemoryContent() {
 
 				{showInput ? (
 					<div className="absolute bottom-3 inset-x-3 z-10">
-						<div className="relative flex items-center gap-2 rounded-full border bg-muted/60 backdrop-blur-sm px-4 py-2 shadow-sm">
+						<div
+							ref={inputContainerRef}
+							className="relative flex h-[54px] items-center gap-2 rounded-[9999px] border bg-muted/60 backdrop-blur-sm pl-4 pr-1 shadow-sm"
+						>
 							<input
 								ref={textareaRef}
 								type="text"
@@ -200,9 +221,15 @@ export function MemoryContent() {
 								variant="ghost"
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
-								className="h-9 w-9 shrink-0 rounded-full"
+								className={`h-11 w-11 shrink-0 rounded-full ${
+									editing ? "" : "bg-muted-foreground/15 hover:bg-muted-foreground/20"
+								}`}
 							>
-								{editing ? <Spinner size="sm" /> : <ArrowUp className="!h-5 !w-5" />}
+								{editing ? (
+									<Spinner size="sm" />
+								) : (
+									<ArrowUp className="!h-5 !w-5 text-foreground" strokeWidth={2.25} />
+								)}
 							</Button>
 						</div>
 					</div>
diff --git a/surfsense_web/components/settings/team-memory-manager.tsx b/surfsense_web/components/settings/team-memory-manager.tsx
index c89463250..872b3da1c 100644
--- a/surfsense_web/components/settings/team-memory-manager.tsx
+++ b/surfsense_web/components/settings/team-memory-manager.tsx
@@ -3,7 +3,7 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { ArrowUp, ChevronDown, ClipboardCopy, Download, Info, Pen } from "lucide-react";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import { z } from "zod";
 import { updateSearchSpaceMutationAtom } from "@/atoms/search-spaces/search-space-mutation.atoms";
@@ -48,9 +48,30 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 	const [editing, setEditing] = useState(false);
 	const [showInput, setShowInput] = useState(false);
 	const textareaRef = useRef<HTMLInputElement>(null);
+	const inputContainerRef = useRef<HTMLDivElement>(null);
 
 	const memory = searchSpace?.shared_memory_md || "";
 
+	useEffect(() => {
+		if (!showInput) return;
+
+		const handlePointerDownOutside = (event: MouseEvent | TouchEvent) => {
+			const target = event.target;
+			if (!(target instanceof Node)) return;
+			if (inputContainerRef.current?.contains(target)) return;
+
+			setShowInput(false);
+		};
+
+		document.addEventListener("mousedown", handlePointerDownOutside);
+		document.addEventListener("touchstart", handlePointerDownOutside, { passive: true });
+
+		return () => {
+			document.removeEventListener("mousedown", handlePointerDownOutside);
+			document.removeEventListener("touchstart", handlePointerDownOutside);
+		};
+	}, [showInput]);
+
 	const handleClear = async () => {
 		try {
 			setSaving(true);
@@ -126,9 +147,6 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 		if (e.key === "Enter" && !e.shiftKey) {
 			e.preventDefault();
 			handleEdit();
-		} else if (e.key === "Escape") {
-			setShowInput(false);
-			setEditQuery("");
 		}
 	};
 
@@ -189,7 +207,10 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 
 				{showInput ? (
 					<div className="absolute bottom-3 inset-x-3 z-10">
-						<div className="relative flex items-center gap-2 rounded-full border bg-muted/60 backdrop-blur-sm px-4 py-2 shadow-sm">
+						<div
+							ref={inputContainerRef}
+							className="relative flex h-[54px] items-center gap-2 rounded-[9999px] border bg-muted/60 backdrop-blur-sm pl-4 pr-1 shadow-sm"
+						>
 							<input
 								ref={textareaRef}
 								type="text"
@@ -206,9 +227,15 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 								variant="ghost"
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
-								className="h-9 w-9 shrink-0 rounded-full"
+								className={`h-11 w-11 shrink-0 rounded-full ${
+									editing ? "" : "bg-muted-foreground/15 hover:bg-muted-foreground/20"
+								}`}
 							>
-								{editing ? <Spinner size="sm" /> : <ArrowUp className="!h-5 !w-5" />}
+								{editing ? (
+									<Spinner size="sm" />
+								) : (
+									<ArrowUp className="!h-5 !w-5 text-foreground" strokeWidth={2.25} />
+								)}
 							</Button>
 						</div>
 					</div>