diff --git a/lib/screens/home/send/send_amount_sheet.dart b/lib/screens/home/send/send_amount_sheet.dart
index 6de6763..59ef75c 100644
--- a/lib/screens/home/send/send_amount_sheet.dart
+++ b/lib/screens/home/send/send_amount_sheet.dart
@@ -176,13 +176,22 @@ class _SendAmountSheetState extends State<SendAmountSheet> {
                         controller: _amountController,
                         focusNode: _amountFocus,
                         keyboardType: const TextInputType.numberWithOptions(decimal: true),
-                        inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\.?\d*(?<!\.)\.?\d*'))],
+                        inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^(\d+)?([.,](\d+)?)?'))],
                         style: TextStyle(fontFamily: AppThemes.fonts.gilroyBold, fontSize: 25),
                         textAlign: TextAlign.center,
                         decoration: const InputDecoration(
                           border: InputBorder.none,
                         ),
                         onChanged: (val){
+                          if (val.contains(",")){
+                            val = val.replaceAll(",", ".");
+                            _amountController.text = val;
+                            _amountController.value = _amountController.value.copyWith(
+                              selection:
+                              TextSelection(baseOffset: val.length, extentOffset: val.length),
+                              composing: TextRange.empty,
+                            );
+                          }
                           _validateAmountInput(val);
                         },
                       ),
diff --git a/lib/screens/home/swap/swap_main_sheet.dart b/lib/screens/home/swap/swap_main_sheet.dart
index 28a3313..f0f2d83 100644
--- a/lib/screens/home/swap/swap_main_sheet.dart
+++ b/lib/screens/home/swap/swap_main_sheet.dart
@@ -199,7 +199,7 @@ class _SwapMainSheetState extends State<SwapMainSheet> {
                               controller: _baseController,
                               focusNode: _baseFocusNode,
                               keyboardType: const TextInputType.numberWithOptions(decimal: true),
-                              inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\.?\d*(?<!\.)\.?\d*'))],
+                              inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^(\d+)?([.,](\d+)?)?'))],
                               style: TextStyle(fontFamily: AppThemes.fonts.gilroyBold, fontSize: 25),
                               textAlign: TextAlign.center,
                               decoration: InputDecoration(
@@ -210,6 +210,15 @@ class _SwapMainSheetState extends State<SwapMainSheet> {
                                 )
                               ),
                               onChanged: (val){
+                                if (val.contains(",")){
+                                  val = val.replaceAll(",", ".");
+                                  _baseController.text = val;
+                                  _baseController.value = _baseController.value.copyWith(
+                                    selection:
+                                    TextSelection(baseOffset: val.length, extentOffset: val.length),
+                                    composing: TextRange.empty,
+                                  );
+                                }
                                 _validateAmountInput(val);
                               },
                             ),