diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
index 5c681d78a8..c1268b3410 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
@@ -1,13 +1,18 @@
 .umb-property-editor.-not-clickable {
-    pointer-events: none;
+    // pointer-events: none;
 }
 
 .umb-property-editor {
     position:relative;
 }
 
-.umb-property-editor .overlay {
-    background: rgba(255,0,0,0.5);
+.umb-property-editor__view{
+    z-index:1;
+    position:relative;
+}
+
+.umb-property-editor__overlay {
+    background: rgba(255,0,255,0.5);
     display: block;
     position: absolute;
     top:0;
@@ -15,4 +20,6 @@
     height:100%;
     width:100%;
     cursor: not-allowed;
+    user-select: none;
+    z-index:2;
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
index 22d5764da4..4b43d9634c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
@@ -1,4 +1,4 @@
 <div class="umb-property-editor db" ng-class="{'-not-clickable': preview}">
-    <div ng-include="propertyEditorView"></div>
-    <div class="overlay" ng-show="preview === true"></div>
+    <div class="umb-property-editor__view" ng-include="propertyEditorView"></div>
+    <div class="umb-property-editor__overlay" ng-show="preview === true"></div>
 </div>