diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
index c095c2b8fd..521245b940 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
@@ -94,10 +94,14 @@ fun AmountTextField(
         SimpleTextField(
             value = value,
             onValueChange = { newText ->
-                if (decimalFormat.isValidSymbols(newText)) {
-                    val trimmed = decimalFormat.getValidatedNumberWithFixedDecimals(newText, decimals)
-                    onValueChange(trimmed)
-                }
+                onValueChange(
+                    prepareEnter(
+                        oldValue = value,
+                        newValue = newText,
+                        decimalFormat = decimalFormat,
+                        decimals = decimals,
+                    ),
+                )
             },
             textStyle = textStyle.copy(
                 fontSize = fontSize,
@@ -116,8 +120,37 @@ fun AmountTextField(
     }
 }
 
+private fun prepareEnter(oldValue: String, newValue: String, decimalFormat: DecimalFormat, decimals: Int): String {
+    val decimalSymbol = decimalFormat.decimalFormatSymbols.decimalSeparator
+    return if (decimalFormat.isValidSymbols(newValue)) {
+        val parsedValue = newValue.parseBigDecimalOrNull()?.toPlainString()
+            ?: if (newValue.isBlank()) "" else oldValue
+        val replacedWithSymbol = if (parsedValue.findLast { it != decimalSymbol } != null) {
+            when {
+                parsedValue.findLast { it == COMMA_SEPARATOR } != null -> {
+                    parsedValue.replace(COMMA_SEPARATOR, decimalSymbol)
+                }
+                parsedValue.findLast { it == POINT_SEPARATOR } != null -> {
+                    parsedValue.replace(POINT_SEPARATOR, decimalSymbol)
+                }
+                else -> parsedValue
+            }
+        } else {
+            parsedValue
+        }
+        val joinedSymbol = if (newValue.endsWith(COMMA_SEPARATOR) || newValue.endsWith(POINT_SEPARATOR)) {
+            replacedWithSymbol.plus(decimalSymbol)
+        } else {
+            replacedWithSymbol
+        }
+        decimalFormat.getValidatedNumberWithFixedDecimals(joinedSymbol, decimals)
+    } else {
+        oldValue
+    }
+}
+
 private fun DecimalFormat.isValidSymbols(text: String): Boolean {
-    return checkDecimalSeparatorDuplicate(text) && checkGroupingSeparator(text)
+    return checkDecimalSeparatorDuplicate(text)
 }
 
 // region preview
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
index 5006df1d7a..2d685763e3 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
@@ -10,9 +10,9 @@ import java.text.DecimalFormatSymbols
 import java.util.Locale
 
 private const val TEXT_CHUNK_THOUSAND = 3
-private const val POINT_SEPARATOR = '.'
-private const val COMMA_SEPARATOR = ','
 private const val SCIENTIFIC_NOTATION = 'e'
+const val POINT_SEPARATOR = '.'
+const val COMMA_SEPARATOR = ','
 const val DECIMAL_SEPARATOR_LIMIT = 1
 
 @Composable