diff --git a/assets/js/src/form_editor/store/map_form_data_after_loading.jsx b/assets/js/src/form_editor/store/map_form_data_after_loading.jsx
index f2a4f4e9e8..4ca0f813d7 100644
--- a/assets/js/src/form_editor/store/map_form_data_after_loading.jsx
+++ b/assets/js/src/form_editor/store/map_form_data_after_loading.jsx
@@ -20,7 +20,7 @@ export default function mapFormDataAfterLoading(data) {
       slideInFormPosition: data.settings.slide_in_form_position,
       borderRadius: asNum(data.settings.border_radius),
       borderSize: asNum(data.settings.border_size),
-      formPadding: asNum(data.settings.form_padding),
+      formPadding: data.settings.form_padding ? asNum(data.settings.form_padding) : 10,
       inputPadding: asNum(data.settings.input_padding),
       borderColor: data.settings.border_color,
     },
diff --git a/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js b/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js
index 96c12bc91f..2e6d90a0f2 100644
--- a/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js
+++ b/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js
@@ -54,9 +54,13 @@ describe('Form Data Load Mapper', () => {
       expect(map(data).settings).to.have.property('success_page', '5');
     });
 
-    it('maps placement', () => {
+    it('Maps placement', () => {
       expect(map(data).settings).to.have.property('placeFormBellowAllPages', true);
       expect(map(data).settings).to.have.property('placeFormBellowAllPosts', false);
     });
+
+    it('Sets default padding', () => {
+      expect(map(data).settings).to.have.property('formPadding', 10);
+    });
   });
 });