diff --git a/layouts/partials/language-menu.html b/layouts/partials/language-menu.html
index c9f7c66..b5a52f3 100644
--- a/layouts/partials/language-menu.html
+++ b/layouts/partials/language-menu.html
@@ -1,9 +1,20 @@
+{{ $currentpage := .Page }}
 <ul class="menu menu--desktop menu--language-selector">
   <li class="menu__trigger">{{ .Language.LanguageName }}&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       {{ range $.Site.Home.AllTranslations }}
-        <li><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
+      {{ if ne .Lang $currentpage.Language.Lang }}
+        {{ if eq .Lang $.Site.Params.DefaultContentLanguage }}
+	<li><a href="{{ strings.Substr $currentpage.RelPermalink 3 }}">{{ .Language.LanguageName }}</a></li>
+        {{ else }}
+          {{ if eq $currentpage.Language.Lang $.Site.Params.DefaultContentLanguage }}
+	  <li><a href="/{{ .Lang }}{{ $currentpage.RelPermalink }}">{{ .Language.LanguageName }}</a></li>
+          {{ else }}
+	  <li><a href="/{{ .Lang }}{{ substr $currentpage.RelPermalink 3 }}">{{ .Language.LanguageName }}</a></li>
+          {{ end }}
+        {{ end }}
+      {{ end }}
       {{ end }}
     </ul>
   </li>
diff --git a/layouts/partials/mobile-menu.html b/layouts/partials/mobile-menu.html
index 70e9d29..d3ef00c 100644
--- a/layouts/partials/mobile-menu.html
+++ b/layouts/partials/mobile-menu.html
@@ -1,3 +1,4 @@
+{{ $currentpage := .Page }}
 <ul class="menu menu--mobile">
   <li class="menu__trigger">Menu&nbsp;▾</li>
   <li>
@@ -10,10 +11,19 @@
       {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }}
         <hr />
         {{ range $.Site.Home.AllTranslations }}
-          <li>
-            <a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
-          </li>
+        {{ if ne .Lang $currentpage.Language.Lang }}
+        {{ if eq .Lang $.Site.Params.DefaultContentLanguage }}
+        <li><a href="{{ strings.Substr $currentpage.RelPermalink 3 }}">{{ .Language.LanguageName }}</a></li>
+        {{ else }}
+          {{ if eq $currentpage.Language.Lang $.Site.Params.DefaultContentLanguage }}
+          <li><a href="/{{ .Lang }}{{ $currentpage.RelPermalink }}">{{ .Language.LanguageName }}</a></li>
+          {{ else }}
+          <li><a href="/{{ .Lang }}{{ substr $currentpage.RelPermalink 3 }}">{{ .Language.LanguageName }}</a></li>
+          {{ end }}
         {{ end }}
+        {{ end }}
+        {{ end }}
+
       {{ end }}
     </ul>
   </li>