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..390b2b4107 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
@@ -46,6 +46,7 @@
 public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions {
 
     private static final String CUSTOM_TNC_PROPERTY = "fd:tnc";
+    private static final String SHOW_AS_POPUP_PROPERTY = "fd:showAsPopup";
 
     @JsonIgnore
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_SHOW_APPROVAL_OPTION)
@@ -88,6 +89,7 @@ public boolean isShowAsPopup() {
         if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
             properties.put(CUSTOM_TNC_PROPERTY, true);
         }
+        properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup());
         return properties;
     }
 
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
index 228abc2260..fcc80af614 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
@@ -105,6 +105,8 @@ public void testCustomFDProperty() {
         Map<String, Object> props = tnc.getProperties();
         Assert.assertTrue(props.containsKey("fd:tnc"));
         Assert.assertTrue((Boolean) props.get("fd:tnc"));
+        Assert.assertTrue(props.containsKey("fd:showAsPopup"));
+        Assert.assertTrue((Boolean) props.get("fd:showAsPopup"));
 
     }
 
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
index 135c166a6d..6f72c3d44e 100644
--- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
@@ -6,6 +6,7 @@
   "properties": {
     "fd:path": "/content/termsandconditions",
     "fd:tnc": true,
+    "fd:showAsPopup": true,
     "customProp": "customPropValue"
   },
   "label": {
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
index 17ad1f88c1..41dfbd898a 100644
--- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
@@ -4,7 +4,8 @@
   "name": "termsandconditions1694159302516",
   "properties": {
     "fd:path": "/content/termsandconditionsNoWrapData",
-    "fd:tnc": true
+    "fd:tnc": true,
+    "fd:showAsPopup": true
   },
   "label": {
     "value": "Terms And Conditions"