diff --git a/ui/imports/shared/popups/SendModal.qml b/ui/imports/shared/popups/SendModal.qml
index 729cb5e8d2..cdbfe7c56c 100644
--- a/ui/imports/shared/popups/SendModal.qml
+++ b/ui/imports/shared/popups/SendModal.qml
@@ -76,7 +76,7 @@ StatusDialog {
                                                                           (networkSelector.bestRoutes && networkSelector.bestRoutes.length <= 0 && !!amountToSendInput.input.text && recipientLoader.ready && !popup.isLoading) ?
                                                                               Constants.NoRoute : Constants.NoError
         readonly property double maxFiatBalance: !!assetSelector.selectedAsset ? assetSelector.selectedAsset.totalCurrencyBalance.amount : 0
-        readonly property double maxCryptoBalance: !!assetSelector.selectedAsset ? assetSelector.selectedAsset.totalBalance.amount : 0
+        readonly property double maxCryptoBalance: !!assetSelector.selectedAsset ? popup.currencyStore.formatCurrencyAmount(assetSelector.selectedAsset.totalBalance.amount, d.inputSymbol, {noSymbol: true, rawAmount: true}, LocaleUtils.userInputLocale) : 0
         readonly property double maxInputBalance: amountToSendInput.inputIsFiat ? maxFiatBalance : maxCryptoBalance
         readonly property string selectedSymbol: !!assetSelector.selectedAsset ? assetSelector.selectedAsset.symbol : ""
         readonly property string inputSymbol: amountToSendInput.inputIsFiat ? popup.store.currentCurrency : selectedSymbol
@@ -262,7 +262,9 @@ StatusDialog {
                             titleText.font.pixelSize: 12
                             bgColor: amountToSendInput.input.valid || !amountToSendInput.input.text ? Theme.palette.primaryColor3 : Theme.palette.dangerColor2
                             titleText.color: amountToSendInput.input.valid || !amountToSendInput.input.text ? Theme.palette.primaryColor1 : Theme.palette.dangerColor1
-                            onTagClicked: amountToSendInput.input.text = d.maxInputBalance
+                            onTagClicked: {
+                                amountToSendInput.input.text = d.maxInputBalance
+                            }
                         }
                     }
                     TokenListView {
diff --git a/ui/imports/shared/views/AmountToSend.qml b/ui/imports/shared/views/AmountToSend.qml
index 09299220a7..6486c55111 100644
--- a/ui/imports/shared/views/AmountToSend.qml
+++ b/ui/imports/shared/views/AmountToSend.qml
@@ -83,7 +83,7 @@ ColumnLayout {
         AmountInputWithCursor {
             id: topAmountToSendInput
             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-            Layout.maximumWidth: 163
+            Layout.maximumWidth: 250
             Layout.preferredWidth: (!!text) ? input.edit.paintedWidth : textMetrics.advanceWidth
             placeholderText: d.zeroString
             input.edit.color: input.valid ? Theme.palette.directColor1 : Theme.palette.dangerColor1