diff --git a/layouts/partials/default.html b/layouts/partials/default.html
index 5a4cf27..5c5b3c4 100644
--- a/layouts/partials/default.html
+++ b/layouts/partials/default.html
@@ -81,7 +81,7 @@
 {{safeHTML .Params.head}}
 <li data-nav-id="{{.Permalink}}" title="{{.Title}}" class="sidelist
   {{if .IsAncestor $currentNode }}parent{{end}}
-  {{with .File}} {{if eq .UniqueID $currentNode.UniqueID}}active{{end}} {{ end }}
+  {{if eq .File.UniqueID $currentNode.File.UniqueID}}active{{end}}
   {{if .Params.alwaysopen}}parent{{end}}">
   <a href="{{.Permalink}}">
     {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}}
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 51ded8f..82a87ab 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -53,10 +53,10 @@
       {{ if eq $translation.Lang .Lang }}
       {{ $selected := false }}
       {{ if eq $pageLang .Lang}}
-      <option id="{{ $translation.Language }}" value="{{ $translation.URL }}" selected>{{ .LanguageName }}
+      <option id="{{ $translation.Language }}" value="{{ $translation.Permalink }}" selected>{{ .LanguageName }}
       </option>
       {{ else }}
-      <option id="{{ $translation.Language }}" value="{{ $translation.URL }}">{{ .LanguageName }}</option>
+      <option id="{{ $translation.Language }}" value="{{ $translation.Permalink }}">{{ .LanguageName }}</option>
       {{ end }}
       {{ end }}
       {{ end }}