diff --git a/addons/website_sale_wishlist/controllers/main.py b/addons/website_sale_wishlist/controllers/main.py
index 7c54914e434..f0730905da9 100644
--- a/addons/website_sale_wishlist/controllers/main.py
+++ b/addons/website_sale_wishlist/controllers/main.py
@@ -8,6 +8,12 @@ from odoo.addons.website_sale.controllers.main import WebsiteSale
 
 class WebsiteSaleWishlist(WebsiteSale):
 
+    def _get_additional_shop_values(self, values):
+        """ Hook to update values used for rendering website_sale.products template """
+        vals = super()._get_additional_shop_values(values)
+        vals['products_in_wishlist'] = request.env['product.wishlist'].current().product_id.product_tmpl_id
+        return vals
+
     @route(['/shop/wishlist/add'], type='json', auth="public", website=True)
     def add_to_wishlist(self, product_id, **kw):
         website = request.website
diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
index 0b6ac780369..64b7690b123 100644
--- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
@@ -3,8 +3,8 @@
 
     <template id="add_to_wishlist" inherit_id="website_sale.products_item" name="Wishlist Button" priority="20">
         <xpath expr="//div[hasclass('o_wsale_product_btn')]" position="inside">
-            <t t-set="in_wish" t-value="product._is_in_wishlist()"/>
-            <t t-set="product_variant_id" t-value="product._get_first_possible_variant_id()"/>
+            <t t-set="in_wish" t-value="product in products_in_wishlist"/>
+            <t t-set="product_variant_id" t-value="in_wish or product._get_first_possible_variant_id()"/>
             <button t-if="product_variant_id"
                     type="button"
                     role="button"