diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index 3f936297eff..c39c09f0a9f 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -3411,7 +3411,7 @@ var SnippetsMenu = Widget.extend({
                 editor.toggleOverlay(false);
             });
             this.trigger_up('request_cancel', {onReject: after});
-        }, this.$el[0].querySelector('button[data-action=cancel]'));
+        }, this.$el[0].querySelector('button[data-action=cancel]'), false);
     },
     /**
      * Preview on mobile.
@@ -3460,18 +3460,34 @@ var SnippetsMenu = Widget.extend({
             }
         });
     },
-    async _buttonClick(action, button) {
+    /***
+     * Display a loading effect on the clicked button, and disables the other
+     * buttons. Passes an argument to restore the buttons to their normal
+     * state to the function to execute.
+     *
+     * @param action {Function} The action to execute
+     * @param button {HTMLElement} The button element
+     * @param addLoadingEffect {boolean} whether or not to add a loading effect.
+     * @returns {Promise<void>}
+     * @private
+     */
+    async _buttonClick(action, button, addLoadingEffect = true) {
         if (this._buttonAction) {
             return;
         }
         this._buttonAction = true;
-        const removeLoadingEffect = dom.addButtonLoadingEffect(button);
+        let removeLoadingEffect;
+        if (addLoadingEffect) {
+            removeLoadingEffect = dom.addButtonLoadingEffect(button);
+        }
         const actionButtons = this.$el[0].querySelectorAll('[data-action]');
         for (const actionButton of actionButtons) {
             actionButton.disabled = true;
         }
-        const after = () =>  {
-            removeLoadingEffect();
+        const after = () => {
+            if (removeLoadingEffect) {
+                removeLoadingEffect();
+            }
             for (const actionButton of actionButtons) {
                 actionButton.disabled = false;
             }
@@ -3479,7 +3495,6 @@ var SnippetsMenu = Widget.extend({
         await action(after);
         this._buttonAction = false;
     },
-
 });
 
 return {
diff --git a/addons/website/static/src/client_actions/website_preview/website_preview.js b/addons/website/static/src/client_actions/website_preview/website_preview.js
index 04b74732d10..09d333e17a9 100644
--- a/addons/website/static/src/client_actions/website_preview/website_preview.js
+++ b/addons/website/static/src/client_actions/website_preview/website_preview.js
@@ -88,16 +88,6 @@ export class WebsitePreview extends Component {
             };
         }, () => [this.props.action.context.params]);
 
-        useEffect(() => {
-            if (this.websiteContext.edition) {
-                if (this.$welcomeMessage) {
-                    this.$welcomeMessage.detach();
-                }
-            } else {
-                this.addWelcomeMessage();
-            }
-        }, () => [this.websiteContext.edition]);
-
         useEffect(() => {
             this.websiteService.blockIframe();
             this.iframe.el.addEventListener('OdooFrameContentLoaded', () => this.websiteService.unblockIframe(), { once: true });
@@ -172,6 +162,12 @@ export class WebsitePreview extends Component {
         }
     }
 
+    removeWelcomeMessage() {
+        if (this.$welcomeMessage) {
+            this.$welcomeMessage.detach();
+        }
+    }
+
     /**
      * Returns true if the url should be opened in the top
      * window.
diff --git a/addons/website/static/src/client_actions/website_preview/website_preview.xml b/addons/website/static/src/client_actions/website_preview/website_preview.xml
index aa1e9a567f4..32e33efae3c 100644
--- a/addons/website/static/src/client_actions/website_preview/website_preview.xml
+++ b/addons/website/static/src/client_actions/website_preview/website_preview.xml
@@ -26,9 +26,11 @@
                 is-ready="false"/>
         </div>
         <WebsiteEditorComponent t-if="websiteContext.edition"
-            reloadIframe.bind="this.reloadIframe"/>
+            reloadIframe.bind="this.reloadIframe"
+            removeWelcomeMessage.bind="this.removeWelcomeMessage"/>
         <WebsiteTranslator t-if="websiteContext.translation"
-            reloadIframe.bind="this.reloadIframe"/>
+            reloadIframe.bind="this.reloadIframe"
+            removeWelcomeMessage.bind="this.removeWelcomeMessage"/>
     </div>
 </t>
 
diff --git a/addons/website/static/src/components/editor/editor.xml b/addons/website/static/src/components/editor/editor.xml
index c944885fd55..e5fb7e43c2d 100644
--- a/addons/website/static/src/components/editor/editor.xml
+++ b/addons/website/static/src/components/editor/editor.xml
@@ -14,7 +14,8 @@
             wysiwygOptions="this.wysiwygOptions"
             editableElements="this.editableElements"
             savableSelector="this.savableSelector"
-            beforeEditorActive="this.beforeEditorActive"/>
+            beforeEditorActive="this.beforeEditorActive"
+            removeWelcomeMessage="this.props.removeWelcomeMessage"/>
     </div>
 </t>
 </templates>
diff --git a/addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js b/addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
index a568713f721..c6c83d4e3ee 100644
--- a/addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
+++ b/addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
@@ -84,6 +84,13 @@ export class WysiwygAdapterComponent extends ComponentAdapter {
             };
         }, () => []);
     }
+    /**
+     * @override
+     */
+    onWillStart() {
+        this.props.removeWelcomeMessage();
+        return super.onWillStart();
+    }
     /**
      * Stop the widgets and save the content.
      *