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 a3e094d9be..8a43c95e6e 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,19 +1,4 @@
-.umb-property-editor {
-    position: relative;
-}
-
-.umb-property-editor__view{
-    z-index: 1;
-    position: relative;
-}
-
-.umb-property-editor__overlay {
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
+.umb-property-editor--preview {
+    pointer-events: none;
     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 820721df9e..d027364913 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,6 +1,5 @@
-<div class="umb-property-editor db">
+<div class="umb-property-editor db" ng-class="{'umb-property-editor--preview': preview}">
     <div disable-tabindex="preview">
-        <div class="umb-property-editor__view" ng-include="propertyEditorView"></div>
-        <div class="umb-property-editor__overlay" ng-show="preview === true"></div>
+        <div ng-include="propertyEditorView"></div>
     </div>
 </div>