diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
index d47f299225f9..16f139f91a39 100644
--- a/core/src/main/resources/lib/form/class-entry.jelly
+++ b/core/src/main/resources/lib/form/class-entry.jelly
@@ -45,13 +45,15 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.clazz.name}" />
-  <input type="hidden" name="stapler-class" value="${clazz}" />  <!-- Legacy: Remove once plugins have been staged onto $class -->
-  <j:choose>
-    <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
-      <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
-    </j:when>
-    <j:otherwise>
-      <input type="hidden" name="$class" value="${clazz}" />
-    </j:otherwise>
-  </j:choose>
+  <f:invisibleEntry>
+    <input type="hidden" name="stapler-class" value="${clazz}" />  <!-- Legacy: Remove once plugins have been staged onto $class -->
+    <j:choose>
+      <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
+        <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
+      </j:when>
+      <j:otherwise>
+        <input type="hidden" name="$class" value="${clazz}" />
+      </j:otherwise>
+    </j:choose>
+  </f:invisibleEntry>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/descriptorRadioList.jelly b/core/src/main/resources/lib/form/descriptorRadioList.jelly
index bc5963a2a197..f6342c551576 100644
--- a/core/src/main/resources/lib/form/descriptorRadioList.jelly
+++ b/core/src/main/resources/lib/form/descriptorRadioList.jelly
@@ -53,9 +53,9 @@ THE SOFTWARE.
         title="${d.displayName}" checked="${instance.descriptor==d}">
         <j:set var="descriptor" value="${d}" />
 	      <j:set var="instance" value="${instance.descriptor==d?instance:null}" />
+          <f:class-entry descriptor="${descriptor}" />
 	      <st:include from="${d}" page="${d.configPage}" optional="true" />
 	    </f:radioBlock>
-        <f:class-entry descriptor="${descriptor}" />
 	  </j:forEach>
 	</f:section>
 </j:jelly>
\ No newline at end of file