diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
index 4f706f23e8..9836b72468 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
@@ -23,6 +23,7 @@
         vm.tabs = [];
         vm.labels = {};
 
+        vm.onTabChange = onTabChange;
         vm.filterItems = filterItems;
         vm.showDetailsOverlay = showDetailsOverlay;
         vm.hideDetailsOverlay = hideDetailsOverlay;
@@ -106,6 +107,13 @@
             }
         }
 
+        function onTabChange(selectedTab) {
+            vm.tabs.forEach(function(tab) {
+                tab.active = false;
+            });
+            selectedTab.active = true;
+        }
+
         function filterItems() {
             // clear item details
             $scope.model.itemDetails = null;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index fabc03f5df..fc18600d66 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -33,48 +33,50 @@
                     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
                     <!-- TABS -->
                     <div ng-if="vm.showTabs">
-                        <umb-tabs-nav model="vm.tabs"></umb-tabs-nav>
-                        <umb-tabs-content>
-                            <umb-tab id="tab{{tab.id}}" ng-repeat="tab in vm.tabs" rel="{{tab.id}}">
-                                <div ng-if="tab.alias==='Default'">
-                                    <div ng-repeat="(key,value) in tab.typesAndEditors">
-                                        <h5>{{key}}</h5>
-                                        <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                            <li ng-repeat="systemDataType in value | orderBy:'name'"
-                                                data-element="editor-{{systemDataType.name}}"
-                                                ng-mouseover="vm.showDetailsOverlay(systemDataType)"
-                                                ng-click="vm.pickEditor(systemDataType)"
-                                                class="-four-in-row">
-                                                <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
-                                                    <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
-                                                    {{ systemDataType.name }}
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
+                        <umb-tabs-nav 
+                            ng-if="vm.tabs" 
+                            tabs="vm.tabs" 
+                            on-tab-change="vm.onTabChange(tab)">
+                        </umb-tabs-nav>
+                        <umb-tab-content ng-repeat="tab in vm.tabs" ng-if="tab.active">
+                            <div ng-if="tab.alias==='Default'">
+                                <div ng-repeat="(key,value) in tab.typesAndEditors">
+                                    <h5>{{key}}</h5>
+                                    <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                        <li ng-repeat="systemDataType in value | orderBy:'name'"
+                                            data-element="editor-{{systemDataType.name}}"
+                                            ng-mouseover="vm.showDetailsOverlay(systemDataType)"
+                                            ng-click="vm.pickEditor(systemDataType)"
+                                            class="-four-in-row">
+                                            <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
+                                                <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
+                                                {{ systemDataType.name }}
+                                            </a>
+                                        </li>
+                                    </ul>
                                 </div>
-                                <div ng-if="tab.alias==='Reuse'">
-                                    <div ng-repeat="(key,value) in tab.userConfigured">
-                                        <h5>{{key}}</h5>
-                                        <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-                                            <li ng-repeat="dataType in value | orderBy:'name'"
-                                                data-element="editor-{{dataType.name}}"
-                                                ng-mouseover="vm.showDetailsOverlay(dataType)"
-                                                ng-click="vm.pickDataType(dataType)"
-                                                class="-four-in-row">
-                                                <div ng-if="dataType.loading" class="umb-card-grid-item__loading">
-                                                    <div class="umb-button__progress"></div>
-                                                </div>
-                                                <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
-                                                    <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
-                                                    {{ dataType.name }}
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
+                            </div>
+                            <div ng-if="tab.alias==='Reuse'">
+                                <div ng-repeat="(key,value) in tab.userConfigured">
+                                    <h5>{{key}}</h5>
+                                    <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                        <li ng-repeat="dataType in value | orderBy:'name'"
+                                            data-element="editor-{{dataType.name}}"
+                                            ng-mouseover="vm.showDetailsOverlay(dataType)"
+                                            ng-click="vm.pickDataType(dataType)"
+                                            class="-four-in-row">
+                                            <div ng-if="dataType.loading" class="umb-card-grid-item__loading">
+                                                <div class="umb-button__progress"></div>
+                                            </div>
+                                            <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
+                                                <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
+                                                {{ dataType.name }}
+                                            </a>
+                                        </li>
+                                    </ul>
                                 </div>
-                            </umb-tab>
-                        </umb-tabs-content>
+                            </div>
+                        </umb-tab-content>
                     </div>
                     <!-- FILTER RESULTS -->
                     <div ng-if="vm.showFilterResult">