--- a/src/pyams_form/interfaces/templates/form.pt	Wed May 26 09:26:21 2021 +0200
+++ b/src/pyams_form/interfaces/templates/form.pt	Wed May 26 09:26:39 2021 +0200
@@ -119,17 +119,17 @@
 									</div>
 								</tal:if>
 							</tal:loop>
+							<div class="subforms"
+								 tal:condition="group.subforms">
+								<fieldset tal:define="title group.subforms_legend"
+										  tal:omit-tag="not:title">
+									<legend tal:condition="title" tal:content="title" i18n:translate="">Title</legend>
+									<tal:loop repeat="subform group.subforms">
+										<tal:var replace="structure subform.render()" />
+									</tal:loop>
+								</fieldset>
+							</div>
 						</fieldset>
-						<div class="subforms"
-							 tal:condition="group.subforms">
-							<fieldset tal:define="title group.subforms_legend"
-									  tal:omit-tag="not:title">
-								<legend tal:condition="title" tal:content="title" i18n:translate="">Title</legend>
-								<tal:loop repeat="subform group.subforms">
-									<tal:var replace="structure subform.render()" />
-								</tal:loop>
-							</fieldset>
-						</div>
 					</tal:loop>
 					<div class="widgets-suffix"
 						 tal:omit-tag="getattr(view, 'hide_widgets_suffix_div', False)"

--- a/src/pyams_form/interfaces/templates/inner-form.pt	Wed May 26 09:26:21 2021 +0200
+++ b/src/pyams_form/interfaces/templates/inner-form.pt	Wed May 26 09:26:39 2021 +0200
@@ -103,17 +103,17 @@
 							</div>
 						</tal:if>
 					</tal:loop>
+					<div class="subforms"
+						 tal:condition="group.subforms">
+						<fieldset tal:define="title group.subforms_legend"
+								  tal:omit-tag="not:title">
+							<legend tal:condition="title" tal:content="title" i18n:translate="">Title</legend>
+							<tal:loop repeat="subform group.subforms">
+								<tal:var replace="structure subform.render()" />
+							</tal:loop>
+						</fieldset>
+					</div>
 				</fieldset>
-				<div class="subforms"
-					 tal:condition="group.subforms">
-					<fieldset tal:define="title group.subforms_legend"
-							  tal:omit-tag="not:title">
-						<legend tal:condition="title" tal:content="title" i18n:translate="">Title</legend>
-						<tal:loop repeat="subform group.subforms">
-							<tal:var replace="structure subform.render()" />
-						</tal:loop>
-					</fieldset>
-				</div>
 			</tal:loop>
 			<div class="widgets-suffix"
 				 tal:omit-tag="getattr(view, 'hide_widgets_suffix_div', False)"