diff --git a/apps/v4/registry/new-york-v4/examples/combobox-dropdown-menu.tsx b/apps/v4/registry/new-york-v4/examples/combobox-dropdown-menu.tsx
index d2522a81c2b..2cb41b5926c 100644
--- a/apps/v4/registry/new-york-v4/examples/combobox-dropdown-menu.tsx
+++ b/apps/v4/registry/new-york-v4/examples/combobox-dropdown-menu.tsx
@@ -3,6 +3,7 @@
 import * as React from "react"
 import { MoreHorizontal } from "lucide-react"
 
+
 import { Button } from "@/registry/new-york-v4/ui/button"
 import {
   Command,
@@ -38,7 +39,17 @@ const labels = [
 
 export default function ComboboxDropdownMenu() {
   const [label, setLabel] = React.useState("feature")
-  const [open, setOpen] = React.useState(false)
+const [open, setOpen] = React.useState(false)
+  // Autofocus fix for CommandInput inside DropdownMenu
+const inputRef = React.useRef<HTMLInputElement>(null)
+
+React.useEffect(() => {
+  if (open && inputRef.current) {
+    setTimeout(() => {
+      inputRef.current?.focus()
+    }, 10)
+  }
+}, [open])
 
   return (
     <div className="flex w-full flex-col items-start justify-between rounded-md border px-4 py-3 sm:flex-row sm:items-center">
@@ -64,11 +75,11 @@ export default function ComboboxDropdownMenu() {
               <DropdownMenuSubTrigger>Apply label</DropdownMenuSubTrigger>
               <DropdownMenuSubContent className="p-0">
                 <Command>
-                  <CommandInput
-                    placeholder="Filter label..."
-                    autoFocus={true}
-                    className="h-9"
-                  />
+                      <CommandInput
+                            ref={inputRef}
+                            placeholder="Filter label..."
+                            className="h-9"
+                            />
                   <CommandList>
                     <CommandEmpty>No label found.</CommandEmpty>
                     <CommandGroup>
diff --git a/apps/v4/registry/new-york-v4/examples/combobox-form.tsx b/apps/v4/registry/new-york-v4/examples/combobox-form.tsx
index 288b51d5436..ec550fd4750 100644
--- a/apps/v4/registry/new-york-v4/examples/combobox-form.tsx
+++ b/apps/v4/registry/new-york-v4/examples/combobox-form.tsx
@@ -63,6 +63,18 @@ export default function ComboboxForm() {
       ),
     })
   }
+  const [open, setOpen] = React.useState(false)
+  const inputRef = React.useRef<HTMLInputElement>(null)
+
+  React.useEffect(() => {
+    if (open && inputRef.current) {
+      setTimeout(() => {
+        inputRef.current?.focus()
+      }, 10)
+    }
+  }, [open])
+
+
 
   return (
     <Form {...form}>
@@ -73,7 +85,7 @@ export default function ComboboxForm() {
           render={({ field }) => (
             <FormItem className="flex flex-col">
               <FormLabel>Language</FormLabel>
-              <Popover>
+              <Popover open={open} onOpenChange={setOpen}>
                 <PopoverTrigger asChild>
                   <FormControl>
                     <Button
@@ -95,10 +107,12 @@ export default function ComboboxForm() {
                 </PopoverTrigger>
                 <PopoverContent className="w-[200px] p-0">
                   <Command>
-                    <CommandInput
-                      placeholder="Search framework..."
-                      className="h-9"
-                    />
+                        <CommandInput
+                          ref={inputRef}
+                          placeholder="Search language..."
+                          className="h-9"
+                        />
+
                     <CommandList>
                       <CommandEmpty>No framework found.</CommandEmpty>
                       <CommandGroup>
diff --git a/deprecated/www/registry/default/examples/combobox-dropdown-menu.tsx b/deprecated/www/registry/default/examples/combobox-dropdown-menu.tsx
index 52ade1b03e7..d85309bf089 100644
--- a/deprecated/www/registry/default/examples/combobox-dropdown-menu.tsx
+++ b/deprecated/www/registry/default/examples/combobox-dropdown-menu.tsx
@@ -40,6 +40,17 @@ export default function ComboboxDropdownMenu() {
   const [label, setLabel] = React.useState("feature")
   const [open, setOpen] = React.useState(false)
 
+  //  Autofocus fix (added)
+  const inputRef = React.useRef<HTMLInputElement>(null)
+
+  React.useEffect(() => {
+    if (open && inputRef.current) {
+      setTimeout(() => {
+        inputRef.current?.focus()
+      }, 10)
+    }
+  }, [open])
+
   return (
     <div className="flex w-full flex-col items-start justify-between rounded-md border px-4 py-3 sm:flex-row sm:items-center">
       <p className="text-sm font-medium leading-none">
@@ -74,9 +85,9 @@ export default function ComboboxDropdownMenu() {
               <DropdownMenuSubContent className="p-0">
                 <Command>
                   <CommandInput
-                    placeholder="Filter label..."
-                    autoFocus={true}
-                  />
+                      ref={inputRef}
+                      placeholder="Filter label..."
+                    />
                   <CommandList>
                     <CommandEmpty>No label found.</CommandEmpty>
                     <CommandGroup>
diff --git a/deprecated/www/registry/new-york/examples/combobox-dropdown-menu.tsx b/deprecated/www/registry/new-york/examples/combobox-dropdown-menu.tsx
index 653d3736ece..a8b993ff4e2 100644
--- a/deprecated/www/registry/new-york/examples/combobox-dropdown-menu.tsx
+++ b/deprecated/www/registry/new-york/examples/combobox-dropdown-menu.tsx
@@ -39,6 +39,15 @@ const labels = [
 export default function ComboboxDropdownMenu() {
   const [label, setLabel] = React.useState("feature")
   const [open, setOpen] = React.useState(false)
+  const inputRef = React.useRef<HTMLInputElement>(null)
+
+  React.useEffect(() => {
+    if (open && inputRef.current) {
+      setTimeout(() => {
+        inputRef.current?.focus()
+      }, 10)
+    }
+  }, [open])
 
   return (
     <div className="flex w-full flex-col items-start justify-between rounded-md border px-4 py-3 sm:flex-row sm:items-center">
@@ -65,10 +74,10 @@ export default function ComboboxDropdownMenu() {
               <DropdownMenuSubContent className="p-0">
                 <Command>
                   <CommandInput
-                    placeholder="Filter label..."
-                    autoFocus={true}
-                    className="h-9"
-                  />
+                      ref={inputRef}
+                      placeholder="Filter label..."
+                      className="h-9"
+                    />
                   <CommandList>
                     <CommandEmpty>No label found.</CommandEmpty>
                     <CommandGroup>
diff --git a/deprecated/www/registry/new-york/examples/combobox-form.tsx b/deprecated/www/registry/new-york/examples/combobox-form.tsx
index c8fae2cd99d..5acc6c827bc 100644
--- a/deprecated/www/registry/new-york/examples/combobox-form.tsx
+++ b/deprecated/www/registry/new-york/examples/combobox-form.tsx
@@ -64,6 +64,18 @@ export default function ComboboxForm() {
       ),
     })
   }
+  // Autofocus fix
+    const [open, setOpen] = React.useState(false)
+    const inputRef = React.useRef<HTMLInputElement>(null)
+
+    React.useEffect(() => {
+      if (open && inputRef.current) {
+        setTimeout(() => {
+          inputRef.current?.focus()
+        }, 10)
+      }
+    }, [open])
+
 
   return (
     <Form {...form}>
@@ -74,7 +86,8 @@ export default function ComboboxForm() {
           render={({ field }) => (
             <FormItem className="flex flex-col">
               <FormLabel>Language</FormLabel>
-              <Popover>
+                <Popover open={open} onOpenChange={setOpen}>
+
                 <PopoverTrigger asChild>
                   <FormControl>
                     <Button
@@ -97,7 +110,8 @@ export default function ComboboxForm() {
                 <PopoverContent className="w-[200px] p-0">
                   <Command>
                     <CommandInput
-                      placeholder="Search framework..."
+                      ref={inputRef}
+                      placeholder="Search language..."
                       className="h-9"
                     />
                     <CommandList>