diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b298e3..6c9e75b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.10.18
+## 07/19/2021
+
+1. [](#improved)
+    * Add logic to allow fieldset form field inside a list field [#2159](https://github.com/getgrav/grav-plugin-admin/pull/2159)
+
 # v1.10.17
 ## 06/15/2021
 
diff --git a/blueprints.yaml b/blueprints.yaml
index 73c0d178..42d3fbd5 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.17
+version: 1.10.18
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:
diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig
index cf9be078..adb95fec 100644
--- a/themes/grav/templates/forms/fields/list/list.html.twig
+++ b/themes/grav/templates/forms/fields/list/list.html.twig
@@ -105,11 +105,17 @@
                                 %}
                             {% elseif child.type %}
                                 {% set originalValue = childValue %}
+                                {% set templateData = { field: child, value: childValue } %}
+
+                                {% if child.type == 'fieldset' %}
+                                    {% set templateData = templateData|merge({val: childValue}) %}
+                                {% endif %}
+
                                 {%
                                     include [
                                         "forms/fields/#{child.type}/#{child.type}.html.twig",
                                         'forms/fields/text/text.html.twig'
-                                    ] with { field: child, value: childValue }
+                                    ] with templateData
                                 %}
                             {% endif %}
                         {% endfor %}