diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 738c8d460ae..2f58cb206bd 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -181,10 +181,12 @@ class website(osv.osv):
         return self.pool['website'].browse(cr, uid, 1, context=context)
 
     def preprocess_request(self, cr, uid, ids, request, context=None):
+        # TODO FP: is_website_publisher and editable in context should be removed
+        # for performance reasons (1 query per image to load) but also to be cleaner
+        # I propose to replace this by a group 'base.group_website_publisher' on the
+        # view that requires it.
         Access = request.registry['ir.model.access']
-        is_website_publisher = (
-                Access.check_groups(cr, uid, 'base.group_website_publisher')
-            and Access.check(cr, uid, 'ir.ui.view', 'write', False, context))
+        is_website_publisher = Access.check(cr, uid, 'ir.ui.view', 'write', False, context)
 
         lang = request.context['lang']
         is_master_lang = lang == request.website.default_lang_code
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b3fc9862f69..282d401b271 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -42,8 +42,8 @@
     </template>
 
     <template id="products_cart" name="Shopping cart">
-      <div class="ribbon-wrapper" contentEditable="false">
-        <div class="ribbon"><span contentEditable="true">Promo</span></div>
+      <div class="ribbon-wrapper">
+        <div class="ribbon">Promo</div>
       </div>
       <div class="oe_product_description">
           <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filter_domain">