diff --git a/assets/js/src/form_editor/store/actions.jsx b/assets/js/src/form_editor/store/actions.jsx
index c296c77b46..f2ec5cbcc0 100644
--- a/assets/js/src/form_editor/store/actions.jsx
+++ b/assets/js/src/form_editor/store/actions.jsx
@@ -44,10 +44,10 @@ export function removeNotice(id) {
 }
 
 export function* saveForm() {
-  yield {
-    type: 'SAVE_FORM_STARTED',
-  };
   yield {
     type: 'SAVE_FORM',
   };
+  yield {
+    type: 'SAVE_FORM_STARTED',
+  };
 }
diff --git a/assets/js/src/form_editor/store/controls.jsx b/assets/js/src/form_editor/store/controls.jsx
index b78458805f..565c774a9c 100644
--- a/assets/js/src/form_editor/store/controls.jsx
+++ b/assets/js/src/form_editor/store/controls.jsx
@@ -3,6 +3,9 @@ import MailPoet from 'mailpoet';
 
 export default {
   SAVE_FORM() {
+    if (select('mailpoet-form-editor').getIsFormSaving()) {
+      return;
+    }
     const formData = select('mailpoet-form-editor').getFormData();
     dispatch('mailpoet-form-editor').removeNotice('save-form');
     MailPoet.Ajax.post({