diff --git a/backend/open_webui/utils/memory.py b/backend/open_webui/utils/memory.py
index 6d96c4cab7..78d58f950e 100644
--- a/backend/open_webui/utils/memory.py
+++ b/backend/open_webui/utils/memory.py
@@ -284,7 +284,7 @@ def validate_memory_operations(form_data) -> list[dict]:
 
 
 def model_allows_memory(model: dict | None) -> bool:
-    return (model or {}).get('info', {}).get('meta', {}).get('capabilities', {}).get('memory', True)
+    return ((model or {}).get('info', {}).get('meta', {}).get('capabilities') or {}).get('memory', True)
 
 
 async def add_memory_context(request, form_data: dict, user, model: dict | None = None):
diff --git a/src/lib/components/common/ConfirmDialog.svelte b/src/lib/components/common/ConfirmDialog.svelte
index 4ea8f8e4e0..10b5037414 100644
--- a/src/lib/components/common/ConfirmDialog.svelte
+++ b/src/lib/components/common/ConfirmDialog.svelte
@@ -47,7 +47,7 @@
 	const handleKeyDown = (event: KeyboardEvent) => {
 		if (event.key === 'Escape') {
 			console.log('Escape');
-			show = false;
+			cancelHandler();
 		}
 
 		if (event.key === 'Enter') {
@@ -65,6 +65,11 @@
 		dispatch('confirm', _inputValue);
 	};
 
+	const cancelHandler = () => {
+		show = false;
+		dispatch('cancel');
+	};
+
 	onMount(() => {
 		mounted = true;
 	});
@@ -107,7 +112,7 @@
 		class=" fixed top-0 right-0 left-0 bottom-0 bg-black/60 w-full h-screen max-h-[100dvh] flex justify-center z-99999999 overflow-hidden overscroll-contain"
 		in:fade={{ duration: 10 }}
 		on:mousedown={() => {
-			show = false;
+			cancelHandler();
 		}}
 	>
 		<div
@@ -174,8 +179,7 @@
 					<button
 						class="text-sm bg-gray-100 hover:bg-gray-200 text-gray-800 dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white font-medium w-full py-2 rounded-3xl transition"
 						on:click={() => {
-							show = false;
-							dispatch('cancel');
+							cancelHandler();
 						}}
 						type="button"
 					>