diff --git a/components/common/Select/index.tsx b/components/common/Select/index.tsx
index faa178c5..aefc5ade 100644
--- a/components/common/Select/index.tsx
+++ b/components/common/Select/index.tsx
@@ -5,7 +5,6 @@ import classNames from 'classnames'
 import Overlay from '~components/common/Overlay'
 
 import ChevronIcon from '~public/icons/Chevron.svg'
-
 import styles from './index.module.scss'
 
 // Props
@@ -96,6 +95,7 @@ const Select = React.forwardRef<HTMLButtonElement, Props>(function select(
       onOpenChange={props.onOpenChange}
     >
       <RadixSelect.Trigger
+        autoFocus={props.autoFocus || false}
         className={triggerClasses}
         placeholder={props.placeholder}
         ref={forwardedRef}
diff --git a/components/common/SelectTableField/index.tsx b/components/common/SelectTableField/index.tsx
index e7fc9cd8..614d0096 100644
--- a/components/common/SelectTableField/index.tsx
+++ b/components/common/SelectTableField/index.tsx
@@ -1,11 +1,9 @@
-import classNames from 'classnames'
 import { useEffect, useState } from 'react'
 import Select from '~components/common/Select'
 import TableField from '~components/common/TableField'
 
-import styles from './index.module.scss'
-
 interface Props {
+  autoFocus?: boolean
   name: string
   label: string
   description?: string
@@ -38,6 +36,7 @@ const SelectTableField = (props: Props) => {
       label={props.label}
     >
       <Select
+        autoFocus={props.autoFocus}
         name={props.name}
         open={props.open}
         onOpenChange={props.onOpenChange}