diff --git a/packages/ui/src/Input.tsx b/packages/ui/src/Input.tsx
index 15ff2925a..16e7c9f27 100644
--- a/packages/ui/src/Input.tsx
+++ b/packages/ui/src/Input.tsx
@@ -138,6 +138,7 @@ export const PasswordInput = forwardRef<HTMLInputElement, PasswordInputProps>((p
 					onClick={() => setShowPassword(!showPassword)}
 					size="icon"
 					className={clsx(props.buttonClassnames)}
+					tabIndex={-1}
 				>
 					<CurrentEyeIcon className="h-4 w-4" />
 				</Button>