diff --git a/packages/ui/v2/core/form/fields.tsx b/packages/ui/v2/core/form/fields.tsx
index 7fcc9e9b35..47b84ad7e6 100644
--- a/packages/ui/v2/core/form/fields.tsx
+++ b/packages/ui/v2/core/form/fields.tsx
@@ -212,14 +212,14 @@ const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function InputF
               "h-9 border border-gray-300",
               addOnFilled && "bg-gray-100",
               addOnLeading && "rounded-l-md border-r-0 px-3",
-              addOnSuffix && "border-l-0 px-3"
+              addOnSuffix && "rounded-r-md border-l-0 px-3"
             )}>
             <div
               className={classNames(
                 "flex h-full flex-col justify-center px-1 text-sm",
                 props.error && "text-red-900"
               )}>
-              <span className="whitespace-nowrap py-2.5 px-3">{addOnLeading || addOnSuffix}</span>
+              <span className="whitespace-nowrap py-2.5">{addOnLeading || addOnSuffix}</span>
             </div>
           </div>
           <Input