diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 60c3d8ad8b..9780b83271 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -32,7 +32,7 @@
         <ul>
           {{ range sort . "Weight"}}
               <li class="" role=""> 
-                  {{.Pre}}<a class="padding" href="{{.URL}}">{{safeHTML .Name}}</a>{{.Post}}
+                  {{.Pre}}<a class="padding" href="{{.URL | absLangURL }}">{{safeHTML .Name}}</a>{{.Post}}
               </li>
           {{end}}
         </ul>
@@ -43,7 +43,7 @@
     <section id="prefooter">
       <hr/>
       <ul>
-      {{ if .Site.IsMultiLingual }}
+      {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
         <li>
           <a class="padding">
             <i class="fa fa-fw fa-language"></i>