diff --git a/addons/website/static/lib/summernote/src/js/core/range.js b/addons/website/static/lib/summernote/src/js/core/range.js
index ea37337f27c..aa72cd31e55 100644
--- a/addons/website/static/lib/summernote/src/js/core/range.js
+++ b/addons/website/static/lib/summernote/src/js/core/range.js
@@ -474,6 +474,11 @@ define([
           return this.normalize();
         }
 
+        // if apply the editor to a P, LI...
+        if (dom.isText(sc) && /^P|^LI|^H[1-7]/.test(sc.parentNode.nodeName.toUpperCase())) {
+          return this.normalize();
+        }
+
         // find inline top ancestor
         var topAncestor;
         if (dom.isInline(sc)) {
diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js
index cc1c88af799..69b45ff1f06 100644
--- a/addons/website/static/src/js/summernote.js
+++ b/addons/website/static/src/js/summernote.js
@@ -1026,7 +1026,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
 
         var node = dom.node(r.sc);
         var last = node;
-        while (node && dom.isSplitable(node) && !dom.isList(node)) {
+        while (node && dom.isSplitable(node) && !dom.isList(node) && !dom.isEditable(node)) {
             last = node;
             node = node.parentNode;
         }