From 40ecab936c92218e9c8aaf10b4d10f8266559770 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Wed, 17 Jun 2020 15:16:54 +0200
Subject: [PATCH] Fix block inserter popover to display over admin bar

[MAILPOET-2976]
---
 assets/css/src/components-form-editor/_block-editor.scss | 5 +++++
 assets/js/src/form_editor/components/editor.jsx          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/css/src/components-form-editor/_block-editor.scss b/assets/css/src/components-form-editor/_block-editor.scss
index 693b7ce67c..60d8736a63 100644
--- a/assets/css/src/components-form-editor/_block-editor.scss
+++ b/assets/css/src/components-form-editor/_block-editor.scss
@@ -88,3 +88,8 @@ h2 {
     width: 300px;
   }
 }
+
+// Fix z-index for block inserter popup to display it over wpadmibar
+.block-editor-inserter__popover {
+  z-index: 100000 !important;
+}
diff --git a/assets/js/src/form_editor/components/editor.jsx b/assets/js/src/form_editor/components/editor.jsx
index c3aa66d3b6..b5e42d5aff 100644
--- a/assets/js/src/form_editor/components/editor.jsx
+++ b/assets/js/src/form_editor/components/editor.jsx
@@ -103,11 +103,11 @@ export default () => {
                 <div className="interface-interface-skeleton__sidebar">
                   { sidebarOpened ? <Sidebar /> : null }
                 </div>
-                <Popover.Slot />
               </BlockEditorProvider>
             </div>
             <FormStyles />
           </div>
+          <Popover.Slot />
         </SlotFillProvider>
       </DropZoneProvider>
       <Preview />