diff --git a/addons/html_builder/static/src/website_builder/plugins/options/header_border_option.js b/addons/html_builder/static/src/website_builder/plugins/options/header_border_option.js
index c1f63214543d0..991b8b050d69c 100644
--- a/addons/html_builder/static/src/website_builder/plugins/options/header_border_option.js
+++ b/addons/html_builder/static/src/website_builder/plugins/options/header_border_option.js
@@ -1,6 +1,8 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { ShadowOption } from "@html_builder/plugins/shadow_option";
+import { onWillStart } from "@odoo/owl";
+import { Deferred } from "@web/core/utils/concurrency";
 
 export class HeaderBorderOption extends BaseOptionComponent {
     static template = "website.HeaderBorderOption";
@@ -8,6 +10,16 @@ export class HeaderBorderOption extends BaseOptionComponent {
     static components = { BorderConfigurator, ShadowOption };
 
     setup() {
+        onWillStart(() => {
+            const def = new Deferred();
+            console.log("HeaderBorderOption setup");
+
+            setTimeout(() => {
+                def.resolve();
+            }, 2000);
+            console.log("HeaderBorderOption setup end");
+            return def;
+        });
         super.setup();
         this.domState = useDomState((editingElement) => ({
             withRoundCorner: !editingElement.classList.contains("o_header_force_no_radius"),
diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index de5cffca69e40..98d82c75e450b 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -140,8 +140,6 @@ def test_get_hoot_filter(self):
         self._test_params = [('-', '-@web/core/autocomplete,-@web/core/autocomplete2')]
         self.assertEqual(self.get_hoot_filters(), '&test=69a6561d&suite=69a6561d&test=cb246db5&suite=cb246db5')
 
-# TODO master-mysterious-egg fix error
-@unittest.skip("prepare mysterious-egg for merging")
 @odoo.tests.tagged('post_install', '-at_install')
 class WebSuite(QunitCommon, HOOTCommon):