diff --git a/assets/css/src/components/formEditor/components/_block_editor.scss b/assets/css/src/components/formEditor/components/_block_editor.scss
index b15874700d..91548bb419 100644
--- a/assets/css/src/components/formEditor/components/_block_editor.scss
+++ b/assets/css/src/components/formEditor/components/_block_editor.scss
@@ -13,8 +13,8 @@
 // There is no way to hide the delete button programmatically so we hide last toolbar that contains the delete option
 // There is a feature request for adding that into Gutenberg https://github.com/WordPress/gutenberg/issues/16364
 // We also hide options to prevent removing Email or Submit when they are in multi-select
-.wp-block[data-type='mailpoet-form/email-input'],
-.wp-block[data-type='mailpoet-form/submit-button'],
+.block-editor-block-contextual-toolbar[data-type='mailpoet-form/email-input'],
+.block-editor-block-contextual-toolbar[data-type='mailpoet-form/submit-button'],
 .is-multi-selected {
   .components-toolbar:last-child {
     display: none;
diff --git a/assets/js/src/form_editor/components/editor.jsx b/assets/js/src/form_editor/components/editor.jsx
index f7035e3595..6228d93848 100644
--- a/assets/js/src/form_editor/components/editor.jsx
+++ b/assets/js/src/form_editor/components/editor.jsx
@@ -45,8 +45,8 @@ export default () => {
 
   return (
     <DropZoneProvider>
-      <div className={layoutClass}>
-        <SlotFillProvider>
+      <SlotFillProvider>
+        <div className={layoutClass}>
           <div className="edit-post-editor-regions__header">
             <Header />
           </div>
@@ -60,6 +60,7 @@ export default () => {
             >
               <div className="edit-post-editor-regions__content">
                 <Notices />
+                <Popover.Slot name="block-toolbar" />
                 <UnsavedChangesNotice />
                 <BlockSelectionClearer className="edit-post-visual-editor editor-styles-wrapper">
                   <BlockEditorKeyboardShortcuts />
@@ -79,9 +80,9 @@ export default () => {
               <Popover.Slot />
             </BlockEditorProvider>
           </div>
-        </SlotFillProvider>
-        <FormStyles />
-      </div>
+          <FormStyles />
+        </div>
+      </SlotFillProvider>
     </DropZoneProvider>
   );
 };