diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index 5a46dab1046..445234dfcd1 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -1060,7 +1060,7 @@ options.registry.menu_data = options.Class.extend({
                         },
                     });
                 }},
-                {text: _t("Edit the menu"), classes: 'btn-primary', click: function () {
+                {text: _t("Edit the menu"), classes: 'btn-primary', close: true, click: function () {
                     this.trigger_up('action_demand', {
                         actionName: 'edit_menu',
                         params: [
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index f694efc7832..ca87689e6d0 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -516,7 +516,7 @@
     </div>
 
     <div data-js="menu_data"
-         data-selector="#top_menu li > a"
+         data-selector="#top_menu li > a, [data-content_menu_id] li > a"
          data-exclude=".dropdown-toggle, li.o_header_menu_button a, [data-toggle], .o_offcanvas_logo"
          data-no-check="true"/>