diff --git a/pages/Receive.qml b/pages/Receive.qml
index f5cac4a9..52ac373e 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -57,7 +57,7 @@ Rectangle {
         var nfields = 0
         s += current_address;
         var amount = amountToReceiveLine.text.trim()
-        if (amount !== "") {
+        if (amount !== "" && amount.slice(-1) !== ".") {
           s += (nfields++ ? "&" : "?")
           s += "tx_amount=" + amount
         }
@@ -456,12 +456,8 @@ Rectangle {
                         placeholderText: qsTr("Amount to receive") + translationManager.emptyString
                         fontBold: true
                         inlineIcon: true
-                        validator: DoubleValidator {
-                            bottom: 0.0
-                            top: 18446744.073709551615
-                            decimals: 12
-                            notation: DoubleValidator.StandardNotation
-                            locale: "C"
+                        validator: RegExpValidator {
+                            regExp: /(\d{1,8})([.]\d{1,12})?$/
                         }
                     }
                 }
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 8a029deb..38100a5b 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -193,12 +193,8 @@ Rectangle {
                       inlineButtonText: qsTr("All") + translationManager.emptyString
                       inlineButton.onClicked: amountLine.text = "(all)"
 
-                      validator: DoubleValidator {
-                          bottom: 0.0
-                          top: 18446744.073709551615
-                          decimals: 12
-                          notation: DoubleValidator.StandardNotation
-                          locale: "C"
+                      validator: RegExpValidator {
+                          regExp: /(\d{1,8})([.]\d{1,12})?$/
                       }
                   }
               }