diff --git a/test_themes/static/src/systray_items/website_switcher.js b/test_themes/static/src/systray_items/website_switcher.js
index 7394298b9..fd716cfef 100644
--- a/test_themes/static/src/systray_items/website_switcher.js
+++ b/test_themes/static/src/systray_items/website_switcher.js
@@ -26,5 +26,18 @@ patch(WebsiteSwitcherSystray.prototype, {
             }
         });
     },
+
+    getElements() {
+        // Add tooltip information
+        const elements = this._super();
+        return elements.map((elem) => {
+            elem.dataset = {
+                ...elem.dataset,
+                ...this.tooltips[elem.id]
+            };
+            return elem
+        });
+    },
+
     template: 'test_themes.WebsiteSwitcherSystray',
 });
diff --git a/test_themes/static/src/systray_items/website_switcher.xml b/test_themes/static/src/systray_items/website_switcher.xml
index 602e8dc1c..c60922962 100644
--- a/test_themes/static/src/systray_items/website_switcher.xml
+++ b/test_themes/static/src/systray_items/website_switcher.xml
@@ -5,9 +5,6 @@
 </t>
 
 <t t-name="test_themes.WebsiteSwitcherSystray" t-inherit="website.WebsiteSwitcherSystray" t-inherit-mode="extension">
-    <xpath expr="//DropdownItem" position="attributes">
-        <attribute name="attrs">this.tooltips[element.id]</attribute>
-    </xpath>
     <!-- With this module installed, disable the warning -->
     <xpath expr="//DropdownItem/t[@t-if='!element.domain']" position="replace">
     </xpath>