diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index da0d26cd33..f5be96304f 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -220,13 +220,29 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     // Listen for language updates
     evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
         languageResource.getAll().then(function (languages) {
-            $scope.languages = languages;
+            contentTypeHelper.allowsVariation().then(function (b) {
+
+                if (b === "true") {
+                    $scope.languages = languages;
+                } else {
+                    $scope.languages = [];
+                }
+
+            });
         });
     }));
 
     evts.push(eventsService.on("editors.languages.languageCreated", function(e, args) {
         languageResource.getAll().then(function(languages) {
-            $scope.languages = languages;
+            contentTypeHelper.allowsVariation().then(function (b) {
+
+                if (b === "true") {
+                    $scope.languages = languages;
+                } else {
+                    $scope.languages = [];
+                }
+
+            });
         });
     }));
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index 81eb3ab59d..5cf9ca21b3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -31,7 +31,7 @@
     position: absolute;
     border-radius: 0 0 3px 3px;
     max-height: 200px;
-    overflow: scroll;
+    overflow: auto;
 }
 
 .umb-language-picker__dropdown a {
@@ -45,4 +45,4 @@
 .umb-language-picker__dropdown a:focus {
     background: @gray-10;
     text-decoration: none;
-}
\ No newline at end of file
+}