diff --git a/components/common/Switch/index.tsx b/components/common/Switch/index.tsx
index 118ea01f..e89a40d3 100644
--- a/components/common/Switch/index.tsx
+++ b/components/common/Switch/index.tsx
@@ -36,6 +36,7 @@ const Switch = (props: Props) => {
       disabled={disabled}
       required={required}
       value={value}
+      tabIndex={props.tabIndex}
       onCheckedChange={onCheckedChange}
     >
       <RadixSwitch.Thumb className={thumbClasses} />
diff --git a/components/common/SwitchTableField/index.tsx b/components/common/SwitchTableField/index.tsx
index db9c5352..c4fe2385 100644
--- a/components/common/SwitchTableField/index.tsx
+++ b/components/common/SwitchTableField/index.tsx
@@ -10,6 +10,7 @@ interface Props {
   description?: string
   value?: boolean
   className?: string
+  tabIndex?: number
   imageAlt?: string
   imageClass?: string
   imageSrc?: string[]
@@ -43,6 +44,7 @@ const SwitchTableField = (props: Props) => {
       <Switch
         name={props.name}
         checked={value}
+        tabIndex={props.tabIndex}
         onCheckedChange={onValueChange}
       />
     </TableField>