diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 3915c3daaeb..f874a5ca5ae 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -54,7 +54,7 @@
      * is editable but its attributes should not be considered editable
      */
     function is_editable_node(element) {
-        return !(element.data('oe-model') === 'ir.ui.view'
+        return (element.data('oe-model') !== 'ir.ui.view'
               || element.data('cke-realelement')
               || (is_editing_host(element) && element.getAttribute('attributeEditable') !== 'true')
               || element.isReadOnly());
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index adb0c704227..36030e8235b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -267,12 +267,6 @@
             }
             if (this.$active_snipped_id) {
                 this.snippet_blur(this.$active_snipped_id);
-                var $overlay = this.$active_snipped_id.data("overlay");
-                if ($overlay) {
-                    $overlay.remove();
-                    this.$active_snipped_id.removeData("overlay");
-                }
-                this.$active_snipped_id.removeData("snippet-editor");
                 this.$active_snipped_id = false;
             }
             if ($snippet && $snippet.length) {
@@ -432,7 +426,6 @@
                                 $target.data("overlay").remove();
                                 $target.removeData("overlay");
                             }
-                            self.create_overlay($target);
                             $target.find("[data-snippet-id]").each(function () {
                                 var $snippet = $(this);
                                 $snippet.removeData("snippet-editor");
@@ -440,10 +433,10 @@
                                     $snippet.data("overlay").remove();
                                     $snippet.removeData("overlay");
                                 }
-                                self.create_overlay($snippet);
                             });
                             // end
 
+                            self.create_overlay($target);
                             self.make_active($target);
                         },0);
                     } else {