diff --git a/input.tsx b/input.tsx
index fc21265..be6ea03 100644
--- a/input.tsx
+++ b/input.tsx
@@ -14,6 +14,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(({ startIcon, endIcon, cl
       className={cn(
         "peer flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm transition-colors disabled:cursor-not-allowed file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground disabled:opacity-50 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
         startIcon && "pl-9",
+        endIcon && "pr-9",
         className,
       )}
       ref={ref}
@@ -22,14 +23,14 @@ const Input = forwardRef<HTMLInputElement, InputProps>(({ startIcon, endIcon, cl
     {startIcon &&
       cloneElement(startIcon as ReactElement, {
         className: cn(
-          "absolute top-2.5 left-3 mr-2 size-4 text-muted-foreground peer-disabled:text-muted peer-focus-visible:text-primary",
+          "absolute top-2.5 left-3 size-4 text-muted-foreground peer-disabled:text-muted peer-focus-visible:text-primary",
           startIcon.props.className,
         ),
       })}
     {endIcon &&
       cloneElement(endIcon as ReactElement, {
         className: cn(
-          "absolute top-2.5 right-3 mr-2 size-4 text-muted-foreground peer-disabled:text-muted peer-focus-visible:text-primary",
+          "absolute top-2.5 right-3 size-4 text-muted-foreground peer-disabled:text-muted peer-focus-visible:text-primary",
           endIcon.props.className,
         ),
       })}
diff --git a/package.json b/package.json
index 866b655..72b64d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@risc0/ui",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "sideEffects": false,
   "type": "module",
   "scripts": {