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 d4d0b537e8..66f47eafc7 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
@@ -135,7 +135,6 @@ export default function mapFormDataAfterLoading(data) {
       backgroundImageUrl: data.settings.background_image_url,
       backgroundImageDisplay: data.settings.background_image_display,
       closeButton: data.settings.close_button ?? defaults.formStyles.closeButton,
-
     },
   };
 
diff --git a/assets/js/src/form_editor/store/selectors.jsx b/assets/js/src/form_editor/store/selectors.jsx
index ba95ba2caa..4b6277956a 100644
--- a/assets/js/src/form_editor/store/selectors.jsx
+++ b/assets/js/src/form_editor/store/selectors.jsx
@@ -44,7 +44,15 @@ export default {
     return state.customFields;
   },
   getAllAvailablePages(state) {
-    return state.pages;
+    const allWPPages = state.allWpPages.map((page) => ({
+      id: page.id,
+      title: page.name,
+    }));
+    const mailpoetPages = state.mailpoetPages.map((page) => ({
+      id: page.ID,
+      title: page.post_title,
+    }));
+    return mailpoetPages.concat(allWPPages);
   },
   getIsFormSaving(state) {
     return state.isFormSaving;
diff --git a/assets/js/src/form_editor/store/store.jsx b/assets/js/src/form_editor/store/store.jsx
index 0c11a430c9..bc4bec96bd 100644
--- a/assets/js/src/form_editor/store/store.jsx
+++ b/assets/js/src/form_editor/store/store.jsx
@@ -51,7 +51,7 @@ export default () => {
     formErrors: validateForm(formData, formBlocks),
     segments: window.mailpoet_form_segments,
     customFields,
-    pages: window.mailpoet_form_pages,
+    mailpoetPages: window.mailpoet_pages,
     isFormSaving: false,
     isCustomFieldSaving: false,
     isCustomFieldCreating: false,
diff --git a/lib/AdminPages/Pages/FormEditor.php b/lib/AdminPages/Pages/FormEditor.php
index bd44266c59..a5c08135ca 100644
--- a/lib/AdminPages/Pages/FormEditor.php
+++ b/lib/AdminPages/Pages/FormEditor.php
@@ -154,7 +154,7 @@ class FormEditor {
           'iframe'    => Export::get('iframe', $form),
           'shortcode' => Export::get('shortcode', $form),
       ],
-      'mailpoet_pages' => Pages::getAll(),
+      'mailpoet_pages' => Pages::getMailPoetPages(),
       'segments' => Segment::getSegmentsWithSubscriberCount(),
       'styles' => $this->formRenderer->getCustomStyles($form),
       'date_types' => array_map(function ($label, $value) {
diff --git a/views/form/editor.html b/views/form/editor.html
index 407b44de68..5e2161e1ce 100644
--- a/views/form/editor.html
+++ b/views/form/editor.html
@@ -23,7 +23,7 @@
   var mailpoet_form_data = <%= json_encode(form) %>;
   var mailpoet_form_exports = <%= json_encode(form_exports) %>;
   var mailpoet_form_segments = <%= json_encode(segments) %>;
-  var mailpoet_form_pages = <%= json_encode(mailpoet_pages) %>;
+  var mailpoet_pages = <%= json_encode(mailpoet_pages) %>;
   var mailpoet_custom_fields = <%= json_encode(custom_fields) %>;
   var mailpoet_date_types = <%= json_encode(date_types) %>;
   var mailpoet_date_formats = <%= json_encode(date_formats) %>;