diff --git a/README.md b/README.md
index e49ab69b..4e3147cd 100644
--- a/README.md
+++ b/README.md
@@ -175,6 +175,11 @@ pagination.pagerSize = 5
   # show selector to switch language
   showLanguageSelector = false
 
+  # the language selector always links...
+  # - true: the translated content equivalent (e.g. /en/posts/some-post directly → /de/posts/some-post), 
+  # - false: just to the translated root (e.g. /en/posts/some-post → /de)
+  #changeLanguageOfCurrentPage = true  # (default: false)
+
   # set theme to full screen width
   fullWidthTheme = false
 
diff --git a/layouts/partials/language-menu.html b/layouts/partials/language-menu.html
index c9f7c66b..87fe05dc 100644
--- a/layouts/partials/language-menu.html
+++ b/layouts/partials/language-menu.html
@@ -1,10 +1,30 @@
 <ul class="menu menu--desktop menu--language-selector">
-  <li class="menu__trigger">{{ .Language.LanguageName }}&nbsp;▾</li>
+  <li class="menu__trigger">{{ .Language.LanguageCode }}&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
+      {{ $current_page_url_without_language_prefix := strings.TrimPrefix (print "/" $.Language.LanguageCode "/") $.Page.RelPermalink }}
       {{ range $.Site.Home.AllTranslations }}
-        <li><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
+        {{ if not ($.Site.Params.changeLanguageOfCurrentPage | default false) }}
+          <li>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+            <a href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+          </li>
+        {{ else if .GetPage $current_page_url_without_language_prefix }}
+          <li>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+            <a href="{{ .RelPermalink }}{{ $current_page_url_without_language_prefix }}">{{ .Language.LanguageName }}</a>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+          </li>
+        {{ else }}
+          <li>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+            <a href="{{ .RelPermalink }}">({{ .Language.LanguageName }})</a>
+            {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+          </li>
+        {{ end }}
       {{ end }}
     </ul>
   </li>
 </ul>
+
diff --git a/layouts/partials/mobile-menu.html b/layouts/partials/mobile-menu.html
index 70e9d29f..7dfaeddd 100644
--- a/layouts/partials/mobile-menu.html
+++ b/layouts/partials/mobile-menu.html
@@ -9,10 +9,27 @@
       {{ end }}
       {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }}
         <hr />
+        {{ $current_page_url_without_language_prefix := strings.TrimPrefix (print "/" $.Language.LanguageCode "/") $.Page.RelPermalink }}
         {{ range $.Site.Home.AllTranslations }}
-          <li>
-            <a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
-          </li>
+          {{ if not ($.Site.Params.changeLanguageOfCurrentPage | default false) }}
+            <li>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+              <a href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+            </li>
+          {{ else if .GetPage $current_page_url_without_language_prefix }}
+            <li>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+              <a href="{{ .RelPermalink }}{{ $current_page_url_without_language_prefix }}">{{ .Language.LanguageName }}</a>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+            </li>
+          {{ else }}
+            <li>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}<b>{{ end }}
+              <a href="{{ .RelPermalink }}">({{ .Language.LanguageName }})</a>
+              {{ if eq $.Language.LanguageCode .Language.LanguageCode }}</b>{{ end }}
+            </li>
+          {{ end }}
         {{ end }}
       {{ end }}
     </ul>