diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java
index 28db3d60a39..ba8aca047b6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java
@@ -117,8 +117,7 @@ protected void populateItem(ListItem<VW> item) {
 
     @Override
     public boolean isEnabled() {
-        return !getModelObject().isReadOnly() && (itemPanelSettings.getEditabilityHandler() == null ||
-                itemPanelSettings.getEditabilityHandler().isEditable(getModelObject()));
+        return !getModelObject().isReadOnly();
     }
 
     // VALUE REGION
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
index f585d44a2f0..ab147720bfe 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
@@ -196,7 +196,7 @@ protected void onError(AjaxRequestTarget target, RuntimeException e) {
                     }
 
                 });
-                formComponent.add(new EnableBehaviour(() -> itemPanelSettings.getEditabilityHandler() == null ||
+                formComponent.add(new EnableBehaviour(() -> itemPanelSettings == null || itemPanelSettings.getEditabilityHandler() == null ||
                         itemPanelSettings.getEditabilityHandler().isEditable(getModelObject())));
             }