diff --git a/components/base/input/input.tsx b/components/base/input/input.tsx
index e073d4d..f3bcbc6 100644
--- a/components/base/input/input.tsx
+++ b/components/base/input/input.tsx
@@ -64,7 +64,7 @@ export const InputBase = ({
     const [isPasswordVisible, setIsPasswordVisible] = useState(false);
 
     // Check if the input has a leading icon or tooltip
-    const hasTrailingIcon = tooltip || isInvalid;
+   const hasTrailingIcon = Boolean(tooltip || isInvalid || type === "password");
     const hasLeadingIcon = Icon;
 
     // If the input is inside a `TextFieldContext`, use its context to simplify applying styles