diff --git a/assets/scss/_custom.scss b/assets/scss/_custom.scss
index 202c50393c..1921e19067 100644
--- a/assets/scss/_custom.scss
+++ b/assets/scss/_custom.scss
@@ -101,18 +101,6 @@ section {
         left: 0;
         background: #fff;
       }
-
-      .dropdown-menu {
-        left: -80px;
-      }
-
-      &.dropdown:hover {
-        color: $medium-grey;
-
-        .dropdown-menu {
-          display: block;
-        }
-      }
     }
   }
 
diff --git a/layouts/partials/navbar-lang-selector.html b/layouts/partials/navbar-lang-selector.html
new file mode 100644
index 0000000000..7459c621c3
--- /dev/null
+++ b/layouts/partials/navbar-lang-selector.html
@@ -0,0 +1,10 @@
+{{/* Link directly to documentation etc., if possible. */}}
+{{ $langPage := cond (gt (len .Translations) 0) . .Site.Home }}
+<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	{{ $langPage.Language.LanguageName }}
+</a>
+<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
+	{{ range $langPage.Translations }}
+	<a class="dropdown-item" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
+	{{ end }}
+</div>
\ No newline at end of file
diff --git a/layouts/partials/navbar-version-selector.html b/layouts/partials/navbar-version-selector.html
index dfded2b553..5a3f03e126 100644
--- a/layouts/partials/navbar-version-selector.html
+++ b/layouts/partials/navbar-version-selector.html
@@ -1,8 +1,8 @@
 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-  {{ T "version_menu" }}
+	{{ .Site.Params.version_menu }}
 </a>
-<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
 	{{ range .Site.Params.versions }}
 	<a class="dropdown-item" href="{{ .url }}">{{ .version }}</a>
 	{{ end }}
-</div>
+</div>
\ No newline at end of file