diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenForm.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenForm.tsx
index e4bed080f80..58eeaeeddff 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenForm.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenForm.tsx
@@ -120,7 +120,6 @@ export const NewScopedTokenForm = ({
                     onClick={() =>
                       form.setValue('resourceAccess', 'project', { shouldValidate: true })
                     }
-                    tabIndex={0}
                   >
                     Create scoped token
                   </button>
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenFormReview.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenFormReview.tsx
index fd73c704629..96a5a7aa650 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenFormReview.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/NewScopedTokenFormReview.tsx
@@ -268,7 +268,6 @@ export const NewScopedTokenFormReview = ({
                     type="button"
                     className={InlineLinkClassName}
                     onClick={onSelectLegacyToken}
-                    tabIndex={0}
                   >
                     create a legacy token
                   </button>
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
index 9d9b92dd55a..272b288cc98 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
@@ -106,12 +106,7 @@ export const ResourceAccessStep = ({
             description={
               <p className="text-foreground-lighter text-sm">
                 Need a token with full access to your account or one for the Supabase MCP server?{' '}
-                <button
-                  type="button"
-                  className={InlineLinkClassName}
-                  onClick={onSelectLegacyToken}
-                  tabIndex={0}
-                >
+                <button type="button" className={InlineLinkClassName} onClick={onSelectLegacyToken}>
                   Create legacy token
                 </button>
               </p>