diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 2dcd5d6f203..136fab1fe20 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -345,7 +345,8 @@ class PageConverter(werkzeug.routing.PathConverter):
         query = query and query.startswith('website.') and query[8:] or query
         if query:
             domain += [('key', 'like', query)]
-        domain += ['|', ('website_id', '=', request.website.id), ('website_id', '=', False)]
+        website_id = request.context.get('website_id') or request.registry['website'].search(cr, uid, [], limit=1)[0]
+        domain += ['|', ('website_id', '=', website_id), ('website_id', '=', False)]
 
         views = View.search_read(cr, uid, domain, fields=['key', 'priority', 'write_date'], order='name', context=context)
         for view in views:
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index d1b6353e582..aef827b86a8 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -511,6 +511,7 @@ class website(osv.osv):
                   of the same.
         :rtype: list({name: str, url: str})
         """
+        request.context = dict(request.context, **context)
         router = request.httprequest.app.get_db_router(request.db)
         # Force enumeration to be performed as public user
         url_set = set()