diff --git a/app/coffee/modules/common/custom-field-values.coffee b/app/coffee/modules/common/custom-field-values.coffee
index dd3e661b..c827afb8 100644
--- a/app/coffee/modules/common/custom-field-values.coffee
+++ b/app/coffee/modules/common/custom-field-values.coffee
@@ -128,15 +128,16 @@ CustomAttributeValueDirective = ($template, $selectedText) ->
     link = ($scope, $el, $attrs, $ctrl) ->
         render = (attributeValue, edit=false) ->
             value = attributeValue.value
+            editable = isEditable()
             ctx = {
                 id: attributeValue.id
                 name: attributeValue.name
                 description: attributeValue.description
                 value: value
-                isEditable: isEditable()
+                isEditable: editable
             }
 
-            if edit or not value
+            if editable and (edit or not value)
                 html = templateEdit(ctx)
             else
                 html = template(ctx)