diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index c703311c8e..97e837c523 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -122,7 +122,8 @@
             this.content = $scope.content;
             if($scope.variantNodeModel) {
                 $scope.defaultVariant = _.find($scope.variantNodeModel.variants, variant => {
-                    return variant.language && variant.language.isDefault;
+                    // defaultVariant will never have segment. Wether it has a language or not depends on the setup.
+                    return !variant.segment && ((variant.language && variant.language.isDefault) || (!variant.language));
                 });
             }
             
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 750159cebc..618bdb19a9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -35,6 +35,7 @@
             });
             scope.vm = {};
             scope.vm.hasVariants = false;
+            scope.vm.hasSubVariants = false;
             scope.vm.hasCulture = false;
             scope.vm.hasSegments = false;
             scope.vm.dropdownOpen = false;
@@ -77,11 +78,12 @@
                         scope.vm.hasCulture = true;
                     }
                     if (variant.segment !== null) {
-                        scope.vm.hasSegment = true;
+                        scope.vm.hasSegments = true;
                     }
                 });
 
-                scope.vm.hasVariants = (scope.vm.hasCulture || scope.vm.hasSegment);
+                scope.vm.hasVariants = (scope.vm.hasCulture || scope.vm.hasSegments);
+                scope.vm.hasSubVariants = (scope.vm.hasCulture && scope.vm.hasSegments);
                 
                 checkErrorsOnOtherVariants();
 
@@ -90,6 +92,7 @@
                     angular.forEach(scope.content.variants, (v) => {
                         if (v.language !== null && v.segment === null) {
                             var variantMenuEntry = {
+                                key: String.CreateGuid(),
                                 open: v.language && v.language.culture === scope.editor.culture,
                                 variant: v,
                                 subVariants: scope.content.variants.filter( (subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null)
@@ -100,6 +103,7 @@
                 } else {
                     angular.forEach(scope.content.variants, (v) => {
                         scope.vm.variantMenu.push({
+                            key: String.CreateGuid(),
                             variant: v
                         });
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 9b230410b0..e292a94606 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -9,9 +9,9 @@
             hide-icon="true"
             hide-description="true">
         </umb-editor-header>
-        
+
         <umb-editor-container>
-            
+
             <umb-load-indicator
                 ng-if="vm.loading">
             </umb-load-indicator>
@@ -21,21 +21,21 @@
 
                     <div ng-if="model.node.variants.length > 1">
                         <h5><localize key="general_language"></localize></h5>
-                        <select 
+                        <select
                             class="input-block-level"
                             ng-model="vm.selectedLanguage"
-                            ng-options="variant as variant.language.name for variant in model.node.variants track by variant.language.culture"
+                            ng-options="variant as variant.displayName for variant in model.node.variants track by variant.language.culture"
                             ng-change="vm.changeLanguage(vm.selectedLanguage)">
                         </select>
                     </div>
-                    
+
                     <div>
-                                            
+
                         <h5><localize key="rollback_currentVersion"></localize></h5>
                         <p>{{vm.currentVersion.name}} (Created: {{vm.currentVersion.createDate}})</p>
-                        
+
                         <h5><localize key="rollback_rollbackTo"></localize></h5>
-                        <select 
+                        <select
                             class="input-block-level"
                             ng-model="vm.selectedVersion"
                             ng-options="version.displayValue for version in vm.previousVersions track by version.versionId"
@@ -48,7 +48,7 @@
 
                         <h5>Changes</h5>
                         <small style="margin-bottom: 15px; display: block;"><localize key="rollback_diffHelp"></localize></small>
-        
+
                         <table class="table table-condensed table-bordered">
                             <tbody>
                                 <tr>
@@ -73,7 +73,7 @@
                                 </tr>
                             </tbody>
                         </table>
-        
+
                     </div>
 
                 </umb-box-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index 800e2dbfcd..d534cd77ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -12,7 +12,7 @@
                     ng-repeat="property in group.properties track by property.alias"
                     property="property"
                     show-inherit="propertyEditorDisabled(property)"
-                    inherits-from="defaultVariant.language.name">
+                    inherits-from="defaultVariant.displayName">
 
                     <div ng-class="{'o-40 cursor-not-allowed': propertyEditorDisabled(property) }">
                         <umb-property-editor
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index a17529ca79..3809379f1b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -49,9 +49,9 @@
                         <span ng-bind="editor.content.displayName"></span>
                     </span>
 
-                    <umb-dropdown ng-if="vm.dropdownOpen" class="umb-variant-switcher" ng-class="{'--has-sub-variants': vm.hasSegment === true}" on-close="vm.dropdownOpen = false" umb-keyboard-list>
+                    <umb-dropdown ng-if="vm.dropdownOpen" class="umb-variant-switcher" ng-class="{'--has-sub-variants': vm.hasSubVariants === true}" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                         <umb-dropdown-item
-                            ng-repeat-start="entry in vm.variantMenu track by $index"
+                            ng-repeat-start="entry in vm.variantMenu track by entry.key"
                             class="umb-variant-switcher__item"
                             ng-class="{'--current': entry.variant === editor.content, '--active': entry.variant.active && vm.dropdownOpen, '--error': variantHasError(entry.variant), '--state-notCreated':entry.variant.state==='NotCreated' && entry.variant.name == null, '--state-draft':entry.variant.state==='Draft' || (entry.variant.state==='NotCreated' && entry.variant.name != null)}"
                         >