diff --git a/assets/js/src/form_editor/store/actions.jsx b/assets/js/src/form_editor/store/actions.jsx
index 489f325c47..915909b22b 100644
--- a/assets/js/src/form_editor/store/actions.jsx
+++ b/assets/js/src/form_editor/store/actions.jsx
@@ -20,6 +20,12 @@ export function saveFormDone(result) {
   };
 }
 
+export function saveFormStarted() {
+  return {
+    type: 'SAVE_FORM_STARTED',
+  };
+}
+
 const createAddNoticeAction = (content, status, isDismissible, id) => ({
   type: 'ADD_NOTICE',
   content,
@@ -47,7 +53,4 @@ export function* saveForm() {
   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 565c774a9c..7eabd2b358 100644
--- a/assets/js/src/form_editor/store/controls.jsx
+++ b/assets/js/src/form_editor/store/controls.jsx
@@ -6,6 +6,7 @@ export default {
     if (select('mailpoet-form-editor').getIsFormSaving()) {
       return;
     }
+    dispatch('mailpoet-form-editor').saveFormStarted();
     const formData = select('mailpoet-form-editor').getFormData();
     dispatch('mailpoet-form-editor').removeNotice('save-form');
     MailPoet.Ajax.post({