diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
index e26b92290a..eb0789a452 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
@@ -31,6 +31,18 @@ angular.module("umbraco.directives")
                     },
                     {
                         name: "Finnish"
+                    },
+                    {
+                        name: "Albanian"
+                    },
+                    {
+                        name: "Russian"
+                    },
+                    {
+                        name: "Norwegian"
+                    },
+                    {
+                        name: "Swedish"
                     }
                 ];
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
index 6459880bdd..eb7fee0697 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
@@ -105,6 +105,9 @@
 
     font-size: 12px;
     font-weight: normal;
+
+    max-height: 165px;
+    overflow-y: auto;
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
index a10ff503b9..f99603afa4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
@@ -1,4 +1,4 @@
-<div class="umb-panel umb-editor-wrapper animated -half-second fadeIn"
+<div class="umb-panel umb-editor-wrapper"
     ng-class="{
         '-no-footer': footer === 'false'
     }"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
index 23e5dbc7ce..88338a0c30 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
@@ -19,15 +19,18 @@
                         </div>
 
                         <div class="umb-property-editor__dropdown shadow-depth-2" ng-if="showDropdown" on-outside-click="closeDropdown()">
+
+                            <div class="umb-property-editor__dropdown-item">
+                                <a class="umb-property-editor__dropdown-link -sync-off" ng-click="editContent()" href="">
+                                    <i class="icon-edit"></i>Edit content
+                                </a>
+                            </div>
+                            <div class="umb-property-editor__dropdown-filter">
+                                <input type="search"class="-full-width-input" placeholder="Search for variants" ng-model="searchTerm" umb-auto-focus>
+                            </div>
+
                             <ul class="umb-property-editor__dropdown-items">
-                                <li class="umb-property-editor__dropdown-item">
-                                    <a class="umb-property-editor__dropdown-link -sync-off" ng-click="editContent()" href="">
-                                        <i class="icon-edit"></i>Edit content
-                                    </a>
-                                </li>
-                                <li class="umb-property-editor__dropdown-filter">
-                                    <input type="search"class="-full-width-input" placeholder="Search for variants" ng-model="searchTerm" umb-auto-focus>
-                                </li>
+
                                 <li class="umb-property-editor__dropdown-item" ng-repeat="variation in variations | filter:searchTerm">
                                     <a class="umb-property-editor__dropdown-link" ng-click="syncContent(variation)" href="">{{ variation.name }}</a>
                                 </li>