diff --git a/addons/web_editor/models/ir_http.py b/addons/web_editor/models/ir_http.py
index c72fee55e83..874ccc6eddb 100644
--- a/addons/web_editor/models/ir_http.py
+++ b/addons/web_editor/models/ir_http.py
@@ -11,6 +11,6 @@ class ir_http(orm.AbstractModel):
             request.context['editable'] = True
         if 'edit_translations' in request.httprequest.args and 'edit_translations' not in request.context:
             request.context['edit_translations'] = True
-        if request.context.get('lang') != "en_US" and 'translatable' not in request.context:
+        if request.context.get('edit_translations') and 'translatable' not in request.context:
             request.context['translatable'] = True
         return super(ir_http, self)._dispatch()
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 136fab1fe20..b8af335a17e 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -160,7 +160,7 @@ class ir_http(orm.AbstractModel):
                     request.uid = None
                     path.pop(1)
                     return self.reroute('/'.join(path) or '/')
-            if path[1] == request.website.default_lang_code:
+            if request.lang == request.website.default_lang_code:
                 request.context['edit_translations'] = False
             if not request.context.get('tz'):
                 request.context['tz'] = request.session.get('geoip', {}).get('time_zone')