diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index 8215c66691..c54d692850 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -18,10 +18,10 @@
                     <umb-property-editor
                         model="property"
                         node="contentNodeModel"
-                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
-                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
+                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
+                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{ !allowUpdate || undefined}}">
+                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
@@ -52,10 +52,10 @@
                     <umb-property-editor
                         model="property"
                         node="contentNodeModel"
-                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
-                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
+                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
+                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{!allowUpdate || undefined}}">
+                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 086fa3aa7d..6c2f8ba58a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -25,7 +25,7 @@
                 ng-click="openCurrentPicker()"
                 id="{{model.alias}}"
                 aria-label="{{model.label}}: {{labels.general_add}}"
-                ng-disabled="readonly">
+                ng-disabled="!allowAdd">
             <localize key="general_add">Add</localize>
             <span class="sr-only">...</span>
         </button>