diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3f0afc1..f5b8f12 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -5,7 +5,7 @@
     {{ $currentPage := . }}
     {{ $pageName := "" }}
     {{ range .Site.Menus.main }}
-      {{ if eq ($currentPage.URL | absLangURL) (.URL | absLangURL) }}
+      {{ if eq ($currentPage.Permalink) (.URL | absLangURL) }}
         {{ $pageName = .Name }}
       {{ end }}
     {{ end }}
@@ -18,7 +18,7 @@
             {{ if eq $pageLang .Lang }}
                 <br/><span class="active">$ echo $LANG<br/><b>{{ .LanguageName }}</b></span><br/>
             {{ else }}
-                <br/><a href="{{ $translation.URL }}">export LANG={{ .LanguageName }}; ./{{ $pageName }}</a><br/>
+                <br/><a href="{{ $translation.Permalink }}">export LANG={{ .LanguageName }}; ./{{ $pageName }}</a><br/>
             {{ end }}
           {{ end }}
       {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 164ca5f..47f032a 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,7 +3,7 @@
     <ul>
     {{ $currentPage := . }}
     {{ range .Site.Menus.main }}
-    <li class="main-nav__item"><a class="nav-main-item{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq ($currentPage.URL | absLangURL) (.URL | absLangURL)) }} active{{end}}" href="{{ .URL | absLangURL }}" title="{{ .Title }}">{{ .Name }}</a></li>
+    <li class="main-nav__item"><a class="nav-main-item{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq ($currentPage.Permalink) (.URL | absLangURL)) }} active{{end}}" href="{{ .URL | absLangURL }}" title="{{ .Title }}">{{ .Name }}</a></li>
     {{ end }}
     </ul>
 </nav>