diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig
index 4d44a859..b7c8490c 100644
--- a/themes/grav/templates/forms/field.html.twig
+++ b/themes/grav/templates/forms/field.html.twig
@@ -13,7 +13,7 @@
{% block contents %}
{% if field.toggleable %}
-
+
{% if field.value_only != true %}
@@ -25,7 +25,7 @@
@@ -41,11 +41,11 @@
{% if value|length %}
{% for key, text in value -%}
{% if text is not iterable %}
- {{ array_field.renderer(key, text, field) }}
+ {{ array_field.renderer(key, text, field, scope) }}
{% else %}
{# Backward compatibility for nested arrays (metas) which are not supported anymore #}
{% for subkey, subtext in text -%}
- {{ array_field.renderer(key ~ ':' ~ subkey, subtext, field) }}
+ {{ array_field.renderer(key ~ ':' ~ subkey, subtext, field, scope) }}
{% endfor %}
{% endif %}
{% endfor %}
@@ -60,7 +60,7 @@
diff --git a/themes/grav/templates/forms/fields/toggle/toggle.html.twig b/themes/grav/templates/forms/fields/toggle/toggle.html.twig
index 29ff794a..8e3e9415 100644
--- a/themes/grav/templates/forms/fields/toggle/toggle.html.twig
+++ b/themes/grav/templates/forms/fields/toggle/toggle.html.twig
@@ -12,7 +12,7 @@
{% block global_attributes %}
{{ parent() }}
- data-grav-field-name="{{ field.name|fieldName }}"
+ data-grav-field-name="{{ (scope ~ field.name)|fieldName }}"
{% endblock %}
{% macro spanToggle(input, length) %}