diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
index 8d2714382f..6a2c012e25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
@@ -1,9 +1,10 @@
 <div class="umb-block-list">
 
+    <umb-load-indicator style="margin-bottom:20px;" ng-if="vm.loading"></umb-load-indicator>
 
     <div class="umb-block-list__wrapper" ng-style="vm.listWrapperStyles">
 
-        <div ui-sortable="vm.sortableOptions" ng-model="vm.blocks">
+        <div ui-sortable="vm.sortableOptions" ng-model="vm.blocks" ng-if="vm.loading !== true">
 
             <div ng-repeat="block in vm.blocks track by block.key">
 
@@ -50,6 +51,7 @@
         </div>
 
         <button
+            ng-if="vm.loading !== true"
             type="button"
             class="btn-reset umb-block-list__create-button umb-outline"
             ng-class="{ '--disabled': vm.availableBlockTypes.length === 0 }"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js
index 68302f2f31..dcf63ce5aa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js
@@ -39,6 +39,7 @@
 
         var vm = this;
 
+        vm.loading = true;
         vm.moveFocusToBlock = null;
         vm.showCopy = clipboardService.isSupported();
 
@@ -128,6 +129,8 @@
             vm.availableContentTypes = modelObject.getAvailableAliasesForBlockContent();
             vm.availableBlockTypes = modelObject.getAvailableBlocksForBlockPicker();
 
+            vm.loading = false;
+            
             $scope.$evalAsync();
 
         }