diff --git a/CHANGELOG.md b/CHANGELOG.md
index de4351d1..8a967f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#improved)
     * Better support for `array` field into `list` field
+    * Attach `_list_index` to fields within list items so that the index/key is available
 1. [](#bugfix)
     * Fixed 2FA regenerate for Flex Users
     * Added missing closing </li> in language loops
diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig
index 87773202..95b3cf32 100644
--- a/themes/grav/templates/forms/fields/list/list.html.twig
+++ b/themes/grav/templates/forms/fields/list/list.html.twig
@@ -71,6 +71,7 @@
                     <li data-collection-item="{{ itemName }}" data-collection-key="{{ key }}" class="{{ collapsible and field.collapsed ? 'collection-collapsed' : '' }}">
                         <div class="collection-sort"><i class="fa fa-fw fa-bars"></i></div>
                         {% for childName, child in field.fields %}
+                            {% set child = child|merge({ '_list_index': itemName }) %}
                             {%- if childName == 'value' -%}
                                 {% set childKey = '' %}
                                 {% set childValue = val %}