diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
index 106d1a0031..6fff684bfe 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
@@ -1,10 +1,13 @@
 
 angular.module("umbraco.directives")
-    .directive('umbProperty', function () {
+    .directive('umbProperty', function (umbPropEditorHelper) {
         return {
             scope: true,
             restrict: 'E',
             replace: true,        
-            templateUrl: 'views/directives/umb-property.html'
+            templateUrl: 'views/directives/umb-property.html',
+            link: function(scope, element, attrs, ctrl) {
+                scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view);
+            }
         };
     });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
index 815531b96f..7ebb343abc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
@@ -15,7 +15,7 @@
                 </label>
 
                 <div class="controls controls-row" >
-                    <ng-include src="model.view"></ng-include>
+                    <ng-include src="propertyEditorView"></ng-include>
                 </div>
             </div>
         </div>
diff --git a/src/Umbraco.Web.UI/umbraco/Views/directives/umb-property.html b/src/Umbraco.Web.UI/umbraco/Views/directives/umb-property.html
deleted file mode 100644
index 815531b96f..0000000000
--- a/src/Umbraco.Web.UI/umbraco/Views/directives/umb-property.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umb-pane">
-    <ng-form name="propertyForm">
-        
-        <div class="control-group umb-control-group"
-             ng-class="{hidelabel:model.hideLabel, error: propertyForm.$invalid}" >
-
-            <val-property-msg property="model"></val-property-msg>
-
-            <div class="umb-el-wrap">
-
-                <label class="control-label" ng-hide="model.hideLabel" for="{{model.alias}}">
-
-                    {{model.label}}
-                    <small>{{model.description}}</small>
-                </label>
-
-                <div class="controls controls-row" >
-                    <ng-include src="model.view"></ng-include>
-                </div>
-            </div>
-        </div>
-
-    </ng-form>
-</div>