diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
index c5e1575e860bb19bc6a39c006af1926a9b5ce4e8..eb3d78db6dba81d7d4748b5d9667e199cb57eb76 100644
--- a/core/src/main/resources/lib/form/class-entry.jelly
+++ b/core/src/main/resources/lib/form/class-entry.jelly
@@ -47,7 +47,7 @@ THE SOFTWARE.
   <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.clazz.name}" />
   <f:invisibleEntry>
     <j:choose>
-      <j:when test="${descriptor != null and descriptor.id != clazz}">
+      <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
         <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
       </j:when>
       <j:otherwise>