From b48337630bcbc9422ae1a1aa27f97bf477f2a4a2 Mon Sep 17 00:00:00 2001
From: G30 <50341825+silentoplayz@users.noreply.github.com>
Date: Fri, 23 Oct 2026 22:07:28 -0400
Subject: [PATCH] fix(a11y): closing the model picker returns focus to its
 button when Accessibility Mode is on (#33062)

---
 .../components/chat/ModelSelector/Selector.svelte   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/chat/ModelSelector/Selector.svelte b/src/lib/components/chat/ModelSelector/Selector.svelte
index d12ea56f7c..671f578d78 100644
--- a/src/lib/components/chat/ModelSelector/Selector.svelte
+++ b/src/lib/components/chat/ModelSelector/Selector.svelte
@@ -132,6 +132,13 @@
 		if (!$mobile) {
 			document.getElementById('chat-input')?.focus();
 		}
+
+		if (
+			$settings?.highContrastMode &&
+			(document.activeElement === document.body || contentElement?.contains(document.activeElement))
+		) {
+			document.getElementById(`model-selector-${id}-button`)?.focus();
+		}
 	};
 
 	const toggleOpen = async () => {
@@ -181,7 +188,11 @@
 			e.preventDefault();
 			e.stopPropagation();
 			show = false;
-			document.getElementById(`model-selector-${id}-button`)?.blur();
+			if ($settings?.highContrastMode) {
+				document.getElementById(`model-selector-${id}-button`)?.focus();
+			} else {
+				document.getElementById(`model-selector-${id}-button`)?.blur();
+			}
 		}
 	};