diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js
index bc9de0ba4f..8445fe9ba3 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js
@@ -493,6 +493,9 @@
         };
         const map = Leaflet.map(field.querySelector('.ez-data-source__map'), mapConfig);
 
+        longitudeInput.value = longitudeInput.dataset.value.replace(',', '.');
+        latitudeInput.value = latitudeInput.dataset.value.replace(',', '.');
+
         /**
          * Updates map state to show location with provided coordinates
          *
diff --git a/src/bundle/Resources/views/fieldtypes/edit/ezgmaplocation.html.twig b/src/bundle/Resources/views/fieldtypes/edit/ezgmaplocation.html.twig
index 2faae023a1..3e77e057d4 100644
--- a/src/bundle/Resources/views/fieldtypes/edit/ezgmaplocation.html.twig
+++ b/src/bundle/Resources/views/fieldtypes/edit/ezgmaplocation.html.twig
@@ -6,8 +6,8 @@
         <div class="form-control-label">{{ 'content.field_type.ezgmaplocation.set_current_location'|trans|desc('Set current location') }}</div>
         <button type="button" class="btn btn-secondary">{{ 'content.field_type.ezgmaplocation.locate_me'|trans|desc('Locate me') }}</button>
     </div>
-    {{ form_row(form.latitude) }}
-    {{ form_row(form.longitude) }}
+    {{ form_row(form.latitude, { 'attr': { 'data-value': form.latitude.vars.value }}) }}
+    {{ form_row(form.longitude, { 'attr': { 'data-value': form.longitude.vars.value }}) }}
     <div class="ez-data-source__field ez-data-source__field--address">
         <div class="ez-data-source__label-wrapper">
             {{ form_label(form.address, form.address.vars.label, {'label_attr': {'class': 'ez-data-source__label'}}) }}