diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index eaef11415a64bcbd6d0a0742ebdffd1a6c638353..d7a02f98437488efc01dae582a8d0f5f7061350c 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1098,7 +1098,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
 <template id="website_search_box" name="Website Searchbox">
-    <div class="input-group">
+    <div t-attf-class="input-group #{_classes}" role="search">
         <input type="text" name="search" class="search-query form-control oe_search_box" placeholder="Search..." t-att-value="search"/>
         <div class="input-group-append">
             <button type="submit" class="btn btn-primary oe_search_button" aria-label="Search" title="Search"><i class="fa fa-search"/></button>
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index ad5b83b72f7cf11620024471f57a73f0147e101d..9f51854ab3c012dba99364b220967c1f5fdb5991 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -146,7 +146,7 @@
 
 <!-- Search Box -->
 <template id="events_search_box" inherit_id="website.website_search_box" primary="True">
-    <xpath expr="//div[hasclass('input-group')]" position="replace">
+    <xpath expr="//div[@role='search']" position="replace">
         <form t-attf-class="o_wevent_event_searchbar_form o_wait_lazy_js my-1 my-lg-0 #{_classes}"
               t-att-action="action if action else '/event'" method="get">
             <t t-set="search" t-value="search or _searches and _searches['search']"/>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index a5cba8d65e80a9f4c7c18ee36cd1e5263fe20c81..07727a1d3994488568f33c40c94583f3e21203c5 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -93,7 +93,10 @@
             <attribute name="data-display-price">true</attribute>
             <attribute name="data-display-image">true</attribute>
         </xpath>
-        <xpath expr="//div[hasclass('input-group')]" position="replace">
+        <xpath expr="//div[@role='search']" position="attributes">
+            <attribute name="t-attf-class" remove="#{_classes}" separator=" "/>
+        </xpath>
+        <xpath expr="//div[@role='search']" position="replace">
             <form t-attf-class="o_wsale_products_searchbar_form o_wait_lazy_js #{_classes}" t-att-action="action if action else '/shop'" method="get">
                 <t>$0</t>
                 <input name="order" type="hidden" class="o_wsale_search_order_by" value=""/>