3 files changed, 10 insertions, 5 deletions
diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss
index ef047d5e4bd..72c3a5f6538 100644
--- a/addons/website/static/src/scss/website.edit_mode.scss
+++ b/addons/website/static/src/scss/website.edit_mode.scss
@@ -154,21 +154,26 @@ table.editorbar-panel {
     }
 }
 
-// s_popup in edit mode
 body.editor_enable.editor_has_snippets {
+    padding-top: 0 !important;
+
     .s_popup .modal {
+        // s_popup in edit mode
         top: var(--o-we-toolbar-height);
         background-color: transparent;
         &.fade .modal-dialog {
             transform: none;
         }
     }
+
+    #oe_main_menu_navbar + #wrapwrap .o_header_affixed {
+        top: 0;
+    }
 }
 
 .editor_has_snippets {
     .o_header_affixed {
         right: $o-we-sidebar-width !important;
-        top: var(--o-we-toolbar-height) !important;
     }
 }
 
diff --git a/addons/website/static/src/scss/website.wysiwyg.scss b/addons/website/static/src/scss/website.wysiwyg.scss
index 4ed8d173fca..3626d895b9a 100644
--- a/addons/website/static/src/scss/website.wysiwyg.scss
+++ b/addons/website/static/src/scss/website.wysiwyg.scss
@@ -20,7 +20,7 @@
 }
 
 // EDITOR TOP BAR AND POPOVER
-#web_editor-top-edit .o_we_website_top_actions {
+.o_we_website_top_actions {
     @include o-position-absolute($top: 0, $right: 0);
     z-index: $zindex-popover + 5;
     display: flex;
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 6b2ae2f36e4..07562de1de8 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -11,8 +11,8 @@
 
     <!-- Editor top bar which contains the summernote tools and save/discard buttons -->
     <t t-name="website.editorbar">
-        <div id="web_editor-top-edit">
-            <form class="o_we_website_top_actions">
+        <div class="o_we_website_top_actions">
+            <form>
                 <button type="button" class="btn btn-primary" data-action="save" accesskey="s">Save</button>
                 <button type="button" class="btn btn-secondary" data-action="cancel" accesskey="j">Discard</button>
             </form>