diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index ddde76e0cf3..f3e60f78285 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -193,13 +193,13 @@
                                             <t t-set="languages" t-value="website.get_languages()"/>
                                             <ul class="nav nav-pills js_language_selector" t-if="(len(languages) &gt; 1 or editable)">
                                                 <li t-foreach="languages" t-as="lg">
-                                                    <a t-att-href="url_for('', lang=lg[0])"
+                                                    <a t-att-href="url_for('', lang=lg[0], keep_query='*')"
                                                        t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
                                                         <t t-esc="lg[1].split('/').pop()"/>
                                                     </a>
                                                 </li>
                                                 <li t-if="editable">
-                                                    <t t-set="url_return" t-value="url_for(request.httprequest.path, '[lang]')"/>
+                                                    <t t-set="url_return" t-value="url_for(request.httprequest.path, '[lang]', keep_query='*')"/>
                                                     <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
                                                         <i class="fa fa-plus-circle"/>
                                                         Add a language...