diff --git a/Resources/Private/Partials/DocumentForm/Group.html b/Resources/Private/Partials/DocumentForm/Group.html
index a84583df..90c3f50c 100644
--- a/Resources/Private/Partials/DocumentForm/Group.html
+++ b/Resources/Private/Partials/DocumentForm/Group.html
@@ -111,6 +111,7 @@
                                         <button type="button"
                                                 title="{f:translate(key: 'form_button.add_item', arguments: {0: fieldItem.displayName})}"
                                                 name="add_field" class="btn btn-secondary add_field" data-field="{fieldItem.uid}"
+                                                data-group="{formGroupUid}"
                                                 data-ajax="{f:uri.action(action:'field',controller:'AjaxDocumentForm',pageType:ajaxTypeNum,arguments:{pageUid: formPageUid,groupUid: formGroupUid,groupIndex: groupIndex,fieldUid: fieldItem.uid})}"
                                                 data-index="{fieldItemIndex}">
                                             <i class="fas fa-plus"></i>
diff --git a/Resources/Public/JavaScript/kitodopublication.js b/Resources/Public/JavaScript/kitodopublication.js
index dffdf6a6..244d3555 100644
--- a/Resources/Public/JavaScript/kitodopublication.js
+++ b/Resources/Public/JavaScript/kitodopublication.js
@@ -2066,7 +2066,7 @@ var setDataRequest = function(url, dataId, context) {
                 var splitId = key.split("-");
                 // key without the last index (field index)
                 var keyWithoutFieldIndex = splitId[0] + '-' + splitId[1] + '-' + splitId[2] + '-' + splitId[3];
-                var isFieldRepeatable = $('.' + keyWithoutFieldIndex + '-' + '0').parent().parent().find('.add_field').length;
+                var isFieldRepeatable = $("button.add_field[data-group=" + splitId[1] + "][data-field=" + splitId[3] + "]").length;
 
                 if($('.' + key).length != 0 && $('.' + key).val() == '' || $('.' + key).length != 0 && $('.' + key).val() != '' && !isFieldRepeatable) {
                     // form field is empty and exists or form field is not empty and not repeatable, overwrite!
@@ -2074,7 +2074,7 @@ var setDataRequest = function(url, dataId, context) {
                 } else if ($('.' + key).length != 0 && $('.' + key).val() != '' && isFieldRepeatable) {
                     // form field exists and is not empty
                     // add new form input
-                    $('.' + keyWithoutFieldIndex + '-' + '0').parent().parent().find('.add_field').click();
+                    $("button.add_field[data-group=" + splitId[1] + "][data-field=" + splitId[3] + "]").click();
 
                     // count repeated fields if not counted already
                     var k = newKeyMapping.get(keyWithoutFieldIndex);
@@ -2106,7 +2106,7 @@ var setDataRequest = function(url, dataId, context) {
                             newKeyMapping.set(keyWithoutFieldIndex, (k + 1));
                         }
                         // add new form input
-                        $('.' + keyWithoutFieldIndex + '-' + '0').parent().parent().find('.add_field').click();
+                        $("button.add_field[data-group=" + splitId[1] + "][data-field=" + splitId[3] + "]").click();
                         isElementLoaded('.' + key, datakey, function (element, fieldKey) {
                             $(element).val(data[fieldKey]).change();
                         });