diff --git a/addons/website/static/src/components/editor/editor.js b/addons/website/static/src/components/editor/editor.js
index 641de495daa..d1f737f4bea 100644
--- a/addons/website/static/src/components/editor/editor.js
+++ b/addons/website/static/src/components/editor/editor.js
@@ -3,6 +3,7 @@
 import legacyEnv from 'web.commonEnv';
 import { useService } from '@web/core/utils/hooks';
 import { WysiwygAdapterComponent } from '../wysiwyg_adapter/wysiwyg_adapter';
+import { useActiveElement } from '@web/core/ui/ui_service';
 
 const { markup, Component, useState, useChildSubEnv, useEffect, onWillStart, onMounted } = owl;
 
@@ -39,6 +40,8 @@ export class WebsiteEditorComponent extends Component {
                 this.publicRootReady();
             }
         });
+
+        useActiveElement('wysiwyg-adapter');
     }
     /**
      * Starts the wysiwyg or disable edition if currently
diff --git a/addons/website/static/src/components/editor/editor.xml b/addons/website/static/src/components/editor/editor.xml
index e5fb7e43c2d..c5bc220baba 100644
--- a/addons/website/static/src/components/editor/editor.xml
+++ b/addons/website/static/src/components/editor/editor.xml
@@ -4,7 +4,9 @@
     <div t-if="state.reloading" class="o_loading_dummy">
         <t t-out="this.loadingDummy"/>
     </div>
-    <div t-if="state.showWysiwyg" t-att-class="{ o_w_wysiwyg_transition: !this.state.reloading, o_w_wysiwyg: this.websiteContext.snippetsLoaded }">
+    <div t-if="state.showWysiwyg"
+        t-ref="wysiwyg-adapter"
+        t-att-class="{ o_w_wysiwyg_transition: !this.state.reloading, o_w_wysiwyg: this.websiteContext.snippetsLoaded }">
         <WysiwygAdapterComponent Component="this.Wysiwyg"
             snippetSelector="this.reloadSelector"
             willReload.bind="this.willReload"
diff --git a/addons/website/static/src/services/website_service.js b/addons/website/static/src/services/website_service.js
index c69541278a3..4f62ef053bb 100644
--- a/addons/website/static/src/services/website_service.js
+++ b/addons/website/static/src/services/website_service.js
@@ -61,7 +61,7 @@ export const websiteService = {
                 document.body.classList.toggle('o_website_fullscreen', fullscreen);
                 bus.trigger((fullscreen ? 'FULLSCREEN-INDICATION-SHOW' : 'FULLSCREEN-INDICATION-HIDE'));
             }
-        });
+        }, { global: true });
         registry.category('main_components').add('FullscreenIndication', {
             Component: FullscreenIndication,
             props: { bus },
diff --git a/addons/website/static/src/systray_items/publish.js b/addons/website/static/src/systray_items/publish.js
index 56af387722c..e8670ffe133 100644
--- a/addons/website/static/src/systray_items/publish.js
+++ b/addons/website/static/src/systray_items/publish.js
@@ -34,7 +34,7 @@ class PublishSystray extends Component {
     }
 }
 PublishSystray.template = xml`
-<div t-on-click="publishContent" class="o_menu_systray_item d-md-flex ms-auto">
+<div t-on-click="publishContent" class="o_menu_systray_item d-md-flex ms-auto" data-hotkey="p">
     <a href="#">
         <Switch value="state.published" extraClasses="'mb-0 o_switch_danger_success'"/>
         <t t-esc="this.label"/>