diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
index ba467f2eab..a023919f4d 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
@@ -87,6 +87,7 @@ public boolean isShowAsPopup() {
         Map<String, Object> properties = super.getProperties();
         if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
             properties.put(CUSTOM_TNC_PROPERTY, true);
+            properties.put("fd:" + ReservedProperties.PN_SHOW_AS_POPUP, isShowAsPopup());
         }
         return properties;
     }