diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index b7efa4d2535..277c9b4143f 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -43,7 +43,10 @@ instance.website.EditorBar = instance.web.Widget.extend({
             .parent().show();
         // TODO: span edition changing edition state (save button)
         var $editables = $('[data-oe-model]')
-                .not('link, script').prop('contentEditable', true)
+                .not('link, script')
+                // FIXME: propagation should make "meta" blocks non-editable in the first place...
+                .not('.oe_snippet_editor')
+                .prop('contentEditable', true)
                 .addClass('oe_editable');
         var $rte_ables = $editables.filter('div, p, li, section, header, footer').not('[data-oe-type]');
         var $raw_editables = $editables.not($rte_ables);
@@ -327,6 +330,8 @@ instance.website.RTE = instance.web.Widget.extend({
             customConfig: '',
             // Disable ACF
             allowedContent: true,
+            // Don't insert paragraphs around content in e.g. <li>
+            autoParagraph: false,
         };
     },
     // TODO clean