diff --git a/mailpoet/lib/AdminPages/Pages/EmailEditor.php b/mailpoet/lib/AdminPages/Pages/EmailEditor.php
index ffaeaddb3f..932a07d8f1 100644
--- a/mailpoet/lib/AdminPages/Pages/EmailEditor.php
+++ b/mailpoet/lib/AdminPages/Pages/EmailEditor.php
@@ -69,6 +69,6 @@ class EmailEditor {
     // Enqueue media library scripts
     $this->wp->wpEnqueueMedia();
 
-    echo '<div id="mailpoet-email-editor"></div>';
+    echo '<div id="mailpoet-email-editor" class="block-editor"></div>';
   }
 }
diff --git a/mailpoet/lib/Config/Menu.php b/mailpoet/lib/Config/Menu.php
index 854d49b0d2..c71ac5e44b 100644
--- a/mailpoet/lib/Config/Menu.php
+++ b/mailpoet/lib/Config/Menu.php
@@ -270,7 +270,7 @@ class Menu {
     );
 
     // newsletter editor
-    $this->wp->addSubmenuPage(
+    $emailEditorPage = $this->wp->addSubmenuPage(
       self::EMAILS_PAGE_SLUG,
       $this->setPageTitle(__('Email', 'mailpoet')),
       esc_html__('Email Editor', 'mailpoet'),
@@ -282,6 +282,13 @@ class Menu {
       ]
     );
 
+    // add body class for form editor page
+    $this->wp->addAction('load-' . $emailEditorPage, function() {
+      $this->wp->addFilter('admin_body_class', function ($classes) {
+        return ltrim($classes . ' block-editor-page');
+      });
+    });
+
     $this->registerAutomationMenu();
 
     // Forms page