diff --git a/packages/stack-ui/src/components/ui/password-input.tsx b/packages/stack-ui/src/components/ui/password-input.tsx
index 764c28786..3db5dec02 100644
--- a/packages/stack-ui/src/components/ui/password-input.tsx
+++ b/packages/stack-ui/src/components/ui/password-input.tsx
@@ -26,6 +26,7 @@ const PasswordInput = forwardRef<HTMLInputElement, InputProps>(
 	        onClick={() => setShowPassword((prev) => !prev)}
 	        disabled={props.disabled}
 	        aria-label={showPassword ? "Hide password" : "Show password"}
+	        tabIndex={-1}
 	      >
 	        {showPassword ? (
 	          <EyeIcon