diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
index 9d0a695d02..0f87634aa6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
@@ -152,6 +152,7 @@
                 }
 
                 var blockModel = {};
+                blockModel.key = String.CreateGuid();
                 blockModel.config = angular.copy(blockConfiguration);
                 blockModel.labelInterpolator = $interpolate(blockModel.config.label);
 
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 2004becba7..05f7fff551 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
@@ -5,7 +5,7 @@
 
         <div ui-sortable="vm.sortableOptions" ng-model="vm.blocks">
 
-            <div ng-repeat="blockItem in vm.blocks">
+            <div ng-repeat="blockItem in vm.blocks track by blockItem.key">
 
                 <button
                     type="button"