diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php
index b93687284cdc3..44d86cc8773c2 100644
--- a/layouts/joomla/form/field/subform/default.php
+++ b/layouts/joomla/form/field/subform/default.php
@@ -34,8 +34,76 @@
 $form = $forms[0];
 ?>
 
-<div class="subform-wrapper">
-<?php foreach ($form->getGroup('') as $field) : ?>
-    <?php echo $field->renderField(); ?>
-<?php endforeach; ?>
-</div>
+<fieldset class="subform-wrapper">
+    <?php if ($groupByFieldset) : ?>
+        <?php foreach ($form->getFieldsets() as $fieldSet) : ?>
+            <?php
+            /*
+             * Fieldset attributes (see https://docs.joomla.org/Advanced_form_guide)
+             *  name                Element name
+             *                      Required value.
+             *  display             Element display style property.
+             *                      Default: "grid"
+             *  gridtemplatecolumns Element grid-template-columns style property.
+             *                      Default: 1fr for each grid field (i.e. all fields in one row)
+             *                          If you have 6 fields then all 6 fields will be in one row.
+             *                          If you set this to "1fr 1fr" then you will have 4 rows with 2 fields in each.
+             *  columngap           Element column-gap style property.
+             *                      Default: "1rem"
+             *  style               Optional style properties for this field set.
+             *                      Example: "border:1px dotted #ccc;padding:2px;box-shadow:2px 2px #888;"
+             *  fieldwrapperstyle   Optional style properties for wrapper around each field in this field set.
+             *                      Example: "border: 1px solid #f00;padding:2px;"
+             */
+            $fields = $form->getFieldset($fieldSet->name);
+
+            $cols = implode(' ', array_fill(0, count($fields), '1fr'));
+
+            $fieldsetStyle = [];
+
+            $fieldsetStyle[] = 'display:' . ($fieldSet->display ?? 'grid') . ';';
+
+            $fieldsetStyle[] = 'grid-template-columns:' . ($fieldSet->gridtemplatecolumns ?? $cols)  . ';';
+
+            $fieldsetStyle[] = 'column-gap:' . ($fieldSet->columngap ?? '1rem') . ';';
+
+            $fieldsetStyle[] = $fieldSet->style ?? '';
+
+            $fieldSetOptions = '';
+
+            if (!empty($fieldSet->class)) {
+                $fieldSetOptions .= ' class="' . $fieldSet->class . '"';
+            }
+
+            if (!empty($fieldsetStyle)) {
+                $fieldSetOptions .= ' style="' . implode('', $fieldsetStyle) . '"';
+            }
+
+            $fieldWrapperOptions = '';
+
+            if (!empty($fieldSet->fieldwrapperstyle)) {
+                $fieldWrapperOptions = ' style="' . $fieldSet->fieldwrapperstyle . '"';
+            }
+
+            ?>
+            <div<?php echo $fieldSetOptions; ?>>
+                <?php foreach ($fields as $field) : ?>
+                    <div<?php echo $fieldWrapperOptions; ?>>
+                        <?php
+                        echo $field->renderField(
+                            [
+                                'class' => $fieldSet->name . ' ' . $fieldSet->name . '-' . $field->fieldname,
+                            ]
+                        );
+                        ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        <?php endforeach; ?>
+    <?php else : ?>
+        <?php foreach ($form->getGroup('') as $field) : ?>
+            <?php echo $field->renderField(); ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+</fieldset>
+