diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
index 778bedcb66..57043e39c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
@@ -23,6 +23,7 @@
         vm.tabsLoaded = 0;
         vm.typesAndEditors = [];
         vm.userConfigured = [];
+        vm.loading = false;
         vm.tabs = [{
             active: true,
             id: 1,
@@ -52,6 +53,8 @@
 
         function getGroupedPropertyEditors() {
 
+            vm.loading = true;
+
             dataTypeResource.getGroupedPropertyEditors().then(function(data) {
                 vm.tabs[0].typesAndEditors = data;
                 vm.typesAndEditors = data;
@@ -63,6 +66,8 @@
 
         function getGroupedDataTypes() {
 
+            vm.loading = true;
+
             dataTypeResource.getGroupedDataTypes().then(function(data) {
                 vm.tabs[1].userConfigured = data;
                 vm.userConfigured = data;
@@ -74,6 +79,7 @@
 
         function checkIfTabContentIsLoaded() {
             if (vm.tabsLoaded === 2) {
+                vm.loading = false;
                 vm.showTabs = true;
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
index 0751eb17f6..7e2b1d3fd7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
@@ -15,6 +15,8 @@
 		</div>
 	</div>
 
+	<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
+
 	<!-- TABS -->
 	<div ng-if="vm.showTabs">