diff --git a/src/components/common/InputValueHelper/index.tsx b/src/components/common/InputValueHelper/index.tsx
index f7e503da8b..55bbffd7a2 100644
--- a/src/components/common/InputValueHelper/index.tsx
+++ b/src/components/common/InputValueHelper/index.tsx
@@ -1,22 +1,26 @@
 import type { ReactNode, SyntheticEvent } from 'react'
-import { Link } from '@mui/material'
+import { InputAdornment, Link } from '@mui/material'
+import type { InputAdornmentProps } from '@mui/material'
 
 type InputValueHelperProps = {
   children: ReactNode
   onClick: () => void
   disabled?: boolean
+  position?: InputAdornmentProps['position']
 }
 
-const InputValueHelper = ({ children, onClick, disabled = false }: InputValueHelperProps) => {
+const InputValueHelper = ({ children, onClick, disabled = false, position = 'end' }: InputValueHelperProps) => {
   const handleClick = (e: SyntheticEvent) => {
     e.preventDefault()
     onClick()
   }
 
   return (
-    <Link component="button" onClick={handleClick} sx={disabled ? { visibility: 'hidden' } : undefined}>
-      {children}
-    </Link>
+    <InputAdornment position={position}>
+      <Link type="button" component="button" onClick={handleClick} sx={disabled ? { visibility: 'hidden' } : undefined}>
+        {children}
+      </Link>
+    </InputAdornment>
   )
 }
 
diff --git a/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx b/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx
index f84de62f4a..a775c06ff6 100644
--- a/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx
+++ b/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx
@@ -106,7 +106,9 @@ const SendAssetsForm = ({ onSubmit, formData }: SendAssetsFormProps): ReactEleme
         ? Math.min(+spendingLimit.amount, +selectedToken.balance).toString()
         : selectedToken.balance
 
-    setValue(SendAssetsField.amount, safeFormatUnits(amount, selectedToken.tokenInfo.decimals))
+    setValue(SendAssetsField.amount, safeFormatUnits(amount, selectedToken.tokenInfo.decimals), {
+      shouldValidate: true,
+    })
   }
 
   return (