diff --git a/frontend/src/components/ui/shared/Input.tsx b/frontend/src/components/ui/shared/Input.tsx
index f7e4676..a1ab507 100644
--- a/frontend/src/components/ui/shared/Input.tsx
+++ b/frontend/src/components/ui/shared/Input.tsx
@@ -38,6 +38,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
       (passwordToggleLabels ? (
         <button
           type="button"
+          tabIndex={-1}
           onClick={() => setShowPassword((visible) => !visible)}
           className="rounded p-0.5 text-text-muted transition-colors hover:text-text-secondary"
           aria-label={
@@ -76,12 +77,6 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             </div>
           )}
 
-          {resolvedEndIcon && (
-            <div className="absolute inset-y-0 right-0 pr-3 flex items-center text-text-muted">
-              {resolvedEndIcon}
-            </div>
-          )}
-
           <input
             ref={ref}
             id={inputId}
@@ -105,6 +100,12 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             `}
             {...props}
           />
+
+          {resolvedEndIcon && (
+            <div className="absolute inset-y-0 right-0 pr-3 flex items-center text-text-muted">
+              {resolvedEndIcon}
+            </div>
+          )}
         </div>
 
         {error && (