diff --git a/src/lib/components/channel/Channel.svelte b/src/lib/components/channel/Channel.svelte
index 8ed982f2d6..a050ec4695 100644
--- a/src/lib/components/channel/Channel.svelte
+++ b/src/lib/components/channel/Channel.svelte
@@ -534,6 +534,7 @@
 			{#if threadId !== null}
 				<Drawer
 					show={threadId !== null}
+					ariaLabel={$i18n.t('Thread')}
 					onClose={() => {
 						threadId = null;
 					}}
diff --git a/src/lib/components/chat/ChatControls.svelte b/src/lib/components/chat/ChatControls.svelte
index 4a200775b3..dc97d63baf 100644
--- a/src/lib/components/chat/ChatControls.svelte
+++ b/src/lib/components/chat/ChatControls.svelte
@@ -325,6 +325,7 @@
 		{#if visible}
 			<Drawer
 				show={true}
+				ariaLabel={$i18n.t('Controls')}
 				onClose={() => showControls.set(false)}
 				onRequestClose={() => showControls.set(false)}
 				panelStyle={$mobile ? panelStyle : ''}
diff --git a/src/lib/components/comments/Comments.svelte b/src/lib/components/comments/Comments.svelte
index da81d75982..2bf3fea69c 100644
--- a/src/lib/components/comments/Comments.svelte
+++ b/src/lib/components/comments/Comments.svelte
@@ -83,7 +83,7 @@
 					</div>
 				</Modal>
 			{:else if $mobile}
-				<Drawer show={true} onClose={() => (view = null)}>
+				<Drawer show={true} ariaLabel={$i18n.t('Comments')} onClose={() => (view = null)}>
 					<div class="h-dvh"><CommentsPanel bind:view onClose={() => (view = null)} /></div>
 				</Drawer>
 			{:else}
diff --git a/src/lib/components/common/CodeEditorModal.svelte b/src/lib/components/common/CodeEditorModal.svelte
index 7343a0cb0a..8b278b63dc 100644
--- a/src/lib/components/common/CodeEditorModal.svelte
+++ b/src/lib/components/common/CodeEditorModal.svelte
@@ -26,7 +26,7 @@
 	});
 </script>
 
-<Drawer bind:show className="h-full" zIndexClass="z-99999">
+<Drawer bind:show className="h-full" zIndexClass="z-99999" ariaLabel={$i18n.t('Code Editor')}>
 	<div class="flex h-full flex-col">
 		<div
 			class=" sticky top-0 z-30 flex justify-between bg-white px-4.5 pt-3 pb-3 dark:bg-gray-900 dark:text-gray-100"
diff --git a/src/lib/components/common/Drawer.svelte b/src/lib/components/common/Drawer.svelte
index a815fa224a..bf09f90c72 100644
--- a/src/lib/components/common/Drawer.svelte
+++ b/src/lib/components/common/Drawer.svelte
@@ -2,6 +2,7 @@
 	import { onDestroy, onMount } from 'svelte';
 	import { flyAndScale } from '$lib/utils/transitions';
 	import { fade, fly, slide } from 'svelte/transition';
+	import * as FocusTrap from 'focus-trap';
 	import { settings } from '$lib/stores';
 	import { matchKeybinding, Shortcut } from '$lib/shortcuts';
 
@@ -13,10 +14,12 @@
 	export let swipeSide: 'left' | 'right' | undefined = undefined;
 	export let onClose = () => {};
 	export let onRequestClose: (() => void) | null = null;
+	export let ariaLabel: string | undefined = undefined;
 	const requestClose = () => (onRequestClose ? onRequestClose() : (show = false));
 
 	let modalElement = null;
 	let mounted = false;
+	let focusTrap: FocusTrap.FocusTrap | null = null;
 
 	const handleKeyDown = (event: KeyboardEvent) => {
 		if (
@@ -34,16 +37,67 @@
 		return modals.length && modals[modals.length - 1] === modalElement;
 	};
 
+	let handleOutsideInteraction: ((event: Event) => void) | undefined;
+	let handleModalFocusIn: (() => void) | undefined;
+	const release = () => {
+		focusTrap?.deactivate();
+		focusTrap = null;
+		if (handleOutsideInteraction) {
+			document.removeEventListener('pointerdown', handleOutsideInteraction, true);
+			window.removeEventListener('focusin', handleOutsideInteraction, true);
+		}
+		if (handleModalFocusIn) modalElement?.removeEventListener('focusin', handleModalFocusIn);
+	};
+
 	onMount(() => {
 		mounted = true;
 	});
 
 	$: if (show && modalElement) {
 		document.body.appendChild(modalElement);
+		if (!focusTrap) {
+			focusTrap = FocusTrap.createFocusTrap(modalElement, {
+				escapeDeactivates: false,
+				allowOutsideClick: true,
+				fallbackFocus: modalElement
+			});
+			focusTrap.activate();
+
+			handleOutsideInteraction = (e) => {
+				if (
+					focusTrap &&
+					modalElement &&
+					e.target instanceof Node &&
+					!modalElement.contains(e.target) &&
+					(e.type === 'pointerdown' ||
+						(e.target instanceof Element &&
+							e.target.closest('[role="menu"], [role="listbox"], [role="combobox"]')))
+				) {
+					focusTrap.pause();
+				} else if (
+					focusTrap &&
+					modalElement &&
+					e.target instanceof Element &&
+					modalElement.compareDocumentPosition(e.target) & Node.DOCUMENT_POSITION_PRECEDING &&
+					!e.target.closest('[data-sonner-toast]')
+				) {
+					focusTrap.unpause();
+				}
+			};
+			handleModalFocusIn = () => {
+				if (focusTrap) {
+					focusTrap.unpause();
+				}
+			};
+			document.addEventListener('pointerdown', handleOutsideInteraction, true);
+			window.addEventListener('focusin', handleOutsideInteraction, true);
+			modalElement.addEventListener('focusin', handleModalFocusIn);
+		}
 		window.addEventListener('keydown', handleKeyDown);
 		document.body.style.overflow = 'hidden';
 	} else if (modalElement) {
 		onClose();
+		release();
 		window.removeEventListener('keydown', handleKeyDown);
 
 		if (document.body.contains(modalElement)) {
@@ -53,6 +107,7 @@
 	}
 
 	onDestroy(() => {
+		release();
 		window.removeEventListener('keydown', handleKeyDown);
 		show = false;
 		if (modalElement) {
@@ -69,6 +124,10 @@
 {#if show}
 	<div
 		bind:this={modalElement}
+		aria-modal="true"
+		aria-label={ariaLabel}
+		role="dialog"
+		tabindex="-1"
 		data-swipe-panel={swipeSide}
 		class="modal fixed right-0 bottom-0 left-0 {zIndexClass} flex h-screen max-h-[100dvh] w-full justify-center overflow-hidden overscroll-contain {swipeSide
 			? ''
diff --git a/src/lib/components/common/InputModal.svelte b/src/lib/components/common/InputModal.svelte
index 24b413a1d8..a9064c3363 100644
--- a/src/lib/components/common/InputModal.svelte
+++ b/src/lib/components/common/InputModal.svelte
@@ -23,7 +23,7 @@
 	let inputElement;
 </script>
 
-<Drawer bind:show>
+<Drawer bind:show ariaLabel={$i18n.t('Input')}>
 	<div class="flex h-full min-h-screen flex-col" {oninput}>
 		<div
 			class=" sticky top-0 z-30 flex justify-between bg-white px-4.5 pt-3 pb-3 dark:bg-gray-900 dark:text-gray-100"
diff --git a/src/lib/components/notes/NoteEditor.svelte b/src/lib/components/notes/NoteEditor.svelte
index ac4ef7dbf3..5e2153e505 100644
--- a/src/lib/components/notes/NoteEditor.svelte
+++ b/src/lib/components/notes/NoteEditor.svelte
@@ -1512,6 +1512,7 @@ ${content}
 					<div class="flex min-h-0 flex-1">
 						<NotePanel
 							bind:show={showNoteTabs}
+							ariaLabel={$i18n.t('Pages')}
 							side="left"
 							panelWidth={280}
 							minWidth={180}
@@ -1659,7 +1660,7 @@ ${content}
 			</div>
 		{/if}
 	</div>
-	<NotePanel bind:show={showNoteChat} onClose={closeNotePanel}>
+	<NotePanel bind:show={showNoteChat} ariaLabel={$i18n.t('Chat')} onClose={closeNotePanel}>
 		<div class="flex items-center justify-between px-2 pt-2 pb-1 shrink-0">
 			<div class="flex gap-1 min-w-0 overflow-x-auto scrollbar-hidden">
 				{#each commentsEnabled ? ['Chat', 'Comments'] : ['Chat'] as tab}
diff --git a/src/lib/components/notes/NotePanel.svelte b/src/lib/components/notes/NotePanel.svelte
index 4252876e2e..79a23f1e59 100644
--- a/src/lib/components/notes/NotePanel.svelte
+++ b/src/lib/components/notes/NotePanel.svelte
@@ -13,6 +13,7 @@
 	export let storageKey = '';
 	export let floating = false;
 	export let onClose: () => void = () => {};
+	export let ariaLabel: string | undefined = undefined;
 
 	let mediaQuery: MediaQueryList;
 	let largeScreen = false;
@@ -36,6 +37,7 @@
 	{#if show}
 		<Drawer
 			{show}
+			{ariaLabel}
 			onClose={() => {
 				show = false;
 				onClose();
diff --git a/src/lib/components/workspace/Knowledge/KnowledgeBase/Browser.svelte b/src/lib/components/workspace/Knowledge/KnowledgeBase/Browser.svelte
index d08d597099..cdffa03e8c 100644
--- a/src/lib/components/workspace/Knowledge/KnowledgeBase/Browser.svelte
+++ b/src/lib/components/workspace/Knowledge/KnowledgeBase/Browser.svelte
@@ -2,7 +2,6 @@
 	import { getContext, onDestroy } from 'svelte';
 	import { beforeNavigate, goto } from '$app/navigation';
 	import { mobile } from '$lib/stores';
-	import { createFocusTrap } from 'focus-trap';
 	import Files from './Files.svelte';
 	import FileViewer from './FileViewer.svelte';
 	import AddContentMenu from './AddContentMenu.svelte';
@@ -89,11 +88,6 @@
 				goto(navigation.to!.url.href).finally(() => (allowNavigation = false));
 			});
 	});
-	const trapFocus = (node: HTMLElement) => {
-		const trap = createFocusTrap(node, { escapeDeactivates: false });
-		trap.activate();
-		return { destroy: () => trap.deactivate() };
-	};
 	onDestroy(() => clearTimeout(debounce));
 </script>
 
@@ -123,15 +117,12 @@
 			resizerId="knowledge-files-resizer">{@render sidebar()}</ResizableSidePanel
 		>{@render viewer()}{/if}
 </div>
-{#if $mobile}<Drawer show={drawerOpen} className="h-full" onRequestClose={close}
-		><div
-			class="h-full"
-			role="dialog"
-			aria-modal="true"
-			aria-label={$i18n.t('File preview')}
-			tabindex="-1"
-			use:trapFocus
-		>
+{#if $mobile}<Drawer
+		show={drawerOpen}
+		className="h-full"
+		ariaLabel={$i18n.t('File preview')}
+		onRequestClose={close}
+		><div class="h-full">
 			{@render viewer()}
 		</div></Drawer
 	>{/if}
diff --git a/src/lib/components/workspace/Skills/SkillFiles.svelte b/src/lib/components/workspace/Skills/SkillFiles.svelte
index 765418bb2e..af4d142d69 100644
--- a/src/lib/components/workspace/Skills/SkillFiles.svelte
+++ b/src/lib/components/workspace/Skills/SkillFiles.svelte
@@ -3,7 +3,6 @@
 	import { onDestroy, getContext, tick, type Snippet } from 'svelte';
 	import { toast } from 'svelte-sonner';
 	import { copyToClipboard } from '$lib/utils';
-	import { createFocusTrap } from 'focus-trap';
 	import { mobile } from '$lib/stores';
 	import Drawer from '$lib/components/common/Drawer.svelte';
 	import ResizableSidePanel from '$lib/components/common/ResizableSidePanel.svelte';
@@ -181,16 +180,7 @@
 		value = content;
 		flush();
 	};
-	const fileDrawer = (node: HTMLElement) => {
-		const trap = createFocusTrap(node, { escapeDeactivates: false });
-		trap.activate();
-		return {
-			destroy: () => {
-				flush();
-				trap.deactivate();
-			}
-		};
-	};
+	const fileDrawer = () => ({ destroy: flush });
 	$: if (!$mobile) showFileDrawer = false;
 	$: if (loadedPath && value !== loadedValue && !readOnly) {
 		dirty = true;
@@ -570,15 +560,8 @@
 </div>
 
 {#if $mobile}
-	<Drawer bind:show={showFileDrawer} className="h-full" onClose={flush}>
-		<div
-			class="h-full"
-			role="dialog"
-			aria-modal="true"
-			aria-label={selected}
-			tabindex="-1"
-			use:fileDrawer
-		>
+	<Drawer bind:show={showFileDrawer} className="h-full" ariaLabel={selected} onClose={flush}>
+		<div class="h-full" use:fileDrawer>
 			{@render fileContent()}
 		</div>
 	</Drawer>