diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbblockeditorblock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbblockeditorblock.directive.js
index 12cd2a868c..9b471f025f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbblockeditorblock.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbblockeditorblock.directive.js
@@ -1,12 +1,12 @@
 angular.module("umbraco.directives").directive('umbBlockEditorBlock', [
     function () {
         var link = function (scope, el, attr, ctrl) {
-            scope.view = attr.view;
+            scope.view = attr.view || "views/propertyeditors/blockeditor/blockeditor.block.default.html";
         };
 
         return {
             restrict: "E",
-            templateUrl: "views/propertyeditors/blockeditor/blockeditor.block.html",
+            template: "<div ng-include='view'></div>",
             link: link
         };
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.default.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.default.html
new file mode 100644
index 0000000000..b27f08e060
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.default.html
@@ -0,0 +1,13 @@
+<div>
+    <div>
+        <div style="cursor:pointer" ng-click="vm.editSettings(block)" class="di">
+            <i class="icon icon-settings"></i>
+        </div>
+        <div style="cursor:pointer" ng-click="vm.remove(block)" class="di">
+            <i class="icon icon-trash"></i>
+        </div>
+    </div>
+    <div style="cursor:pointer" ng-click="vm.editContent(block)">
+        Eventually a block identifier will go here (e.g. element type icon)
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.html
deleted file mode 100644
index 6aeeef7823..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.block.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="handle" >
-    <div ng-if="view" ng-include="view"></div>
-    <div ng-if="!view">
-        <div>
-            <div style="cursor:pointer" ng-click="vm.editSettings(block)" class="di">
-                <i class="icon icon-settings"></i>
-            </div>
-            <div style="cursor:pointer" ng-click="vm.remove(block)" class="di">
-                <i class="icon icon-trash"></i>
-            </div>
-        </div>
-        <div style="cursor:pointer" ng-click="vm.editContent(block)">
-            Eventually a block identifier will go here (e.g. element type icon)
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.default.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.default.html
index 97613b0193..84cf55fe7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.default.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.default.html
@@ -1,7 +1,9 @@
 <div ng-controller="Umbraco.PropertyEditors.BlockEditor.DefaultController">
     <ul class="unstyled" ui-sortable="sortableOptions" ng-model="blocks">
         <li ng-repeat="block in blocks" style="border: 1px solid silver; margin-bottom: 4px; padding: 4px;">
-            <umb-block-editor-block></umb-block-editor-block>
+            <div class="handle">
+                <umb-block-editor-block></umb-block-editor-block>
+            </div>
         </li>
     </ul>