diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 089067cd86d..b4ae50d7694 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -118,6 +118,7 @@ class website(osv.osv):
         is_master_lang = lang == request.website.default_lang_id.code
         request.context.update({
             'lang': lang,
+            'lang_selected': [lg for lg in request.website.language_ids if lg.code == lang],
             'langs': [lg.code for lg in request.website.language_ids],
             'multilang': request.multilang,
             'is_public_user': is_public_user,
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 9d5c7e18538..39596cfbe66 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -87,7 +87,7 @@
                                                 <li t-if="request.multilang and
                                                             (len(website.language_ids) &gt; 1 or editable)" class="dropdown">
                                                     <!-- TODO: use flags for language selection -->
-                                                    <t t-set="lang_selected" t-value="[lg for lg in website.language_ids if lg.code == lang]"/>
+                                                    <t t-set="lang_selected" t-value="website.lang_selected"/>
                                                     <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                                                         <t t-esc="lang_selected[0]['name']"/> <span class="caret"></span>
                                                     </a>