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 6e16e76295..c34ada479e 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,6 +1,10 @@
 .umb-property-editor {
   position: relative;
   contain: style;
+  
+  &.is-preview {
+    contain: layout;
+  }
 }
 
 .umb-property-editor--preview {
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 8667fb84c2..b2387e230a 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">
+<div class="umb-property-editor db" ng-class="{'is-preview': preview}">
 
     <div ng-if="preview && allowUnlock" class="umb-property-editor__lock-overlay-container">
         <div class="umb-property-editor__lock-overlay">
@@ -13,7 +13,7 @@
             <umb-button button-style="success" type="button" action="unlock()" label-key="general_edit" size="xxs"></umb-button>
         </div>
     </div>
-    
+
     <!-- layer to prevent clicks on elements with high z-index-->
     <div ng-if="preview" class="umb-property-editor__preview-overlay"></div>