diff --git a/src/components/ModelSelector.tsx b/src/components/ModelSelector.tsx
index ba7769ce..5af7a164 100644
--- a/src/components/ModelSelector.tsx
+++ b/src/components/ModelSelector.tsx
@@ -433,10 +433,9 @@ export function ModelSelector() {
 
       <DialogContent
         className="p-0 sm:max-w-2xl"
-        onCloseAutoFocus={(e) => {
-          e.preventDefault();
-          document.querySelector<HTMLTextAreaElement>('[data-slot="prompt-box-textarea"]')?.focus();
-        }}
+        finalFocus={() =>
+          document.querySelector<HTMLTextAreaElement>('[data-slot="prompt-box-textarea"]')
+        }
       >
         <DialogHeader className="px-4 pt-4 pb-2">
           <DialogTitle className="text-base">{t("modelSelector.selectModel")}</DialogTitle>