1 files changed, 6 insertions, 1 deletions
diff --git a/templates/language_switcher.html b/templates/language_switcher.html
index b82ddfc..d3cd383 100644
--- a/templates/language_switcher.html
+++ b/templates/language_switcher.html
@@ -1,10 +1,15 @@
 {% if config.extra.language_switcher %}
   <nav>
+    {%- if current_path %}
+      {%- set language_agnostic_path=current_path | replace(from='/' ~ lang ~ '/', to = '/') | trim_start_matches(pat = '/')  -%}
+    {%- endif %}
     {%- for tr in config.extra.translations %}
       {%- if tr.code == lang %}
         <strong>{{ tr.name }}</strong>
       {%- else %}
-        <a href="{{ get_url(path="/", lang=tr.code) }}">{{ tr.name }}</a>
+        {%- if language_agnostic_path %}
+            <a href="{{ get_url(path=language_agnostic_path, lang=tr.code) }}">{{ tr.name }}</a>
+        {%- endif %}
       {%- endif %}
     {%- endfor %}
   </nav>