diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
index ea73004a3f..0aa2dc02c3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
@@ -7,7 +7,7 @@
 **/
 
 //share property editor directive function
-var _umbPropertyEditor = function (umbPropEditorHelper) {
+function umbPropEditor(umbPropEditorHelper) {
         return {
             scope: {
                 model: "=",
@@ -30,11 +30,10 @@ var _umbPropertyEditor = function (umbPropEditorHelper) {
                    scope.model.alias = Math.random().toString(36).slice(2);
                 }
 
-                scope.$watch("model.view", function(val){
-                    scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view, scope.isPreValue);
-                });
+                scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view, scope.isPreValue);
+                
             }
         };
     };
 
-angular.module("umbraco.directives").directive('umbPropertyEditor', _umbPropertyEditor);
+angular.module("umbraco.directives").directive('umbPropertyEditor', umbPropEditor);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
index 0aca32d736..95676a0bcd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
@@ -1,6 +1,6 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Content.Apps.ContentController as vm">
 
-    <div class="umb-expansion-panel" ng-repeat="group in model.tabs | filter: { hide : '!' + true }">
+    <div class="umb-expansion-panel" ng-repeat="group in model.tabs | filter: { hide : '!' + true } track by group.label">
 
         <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
             <div>{{ group.label }}</div>
@@ -15,4 +15,4 @@
 
     </div>
 
-</div>
\ No newline at end of file
+</div>