diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 19036627367..2a4c0660e55 100644
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -604,7 +604,7 @@ class Tool:
                 any_group_errors = False
                 # Check any removals before updating state
                 for i in range( len( group_state ) ):                    
-                    if input.name + "_" + str(i) + "_remove" in incoming:
+                    if key + "_" + str(i) + "_remove" in incoming:
                         del group_state[i]
                 # Update state
                 for i in range( len( group_state ) ):
@@ -621,7 +621,7 @@ class Tool:
                     else:
                         group_errors.append( {} )
                 # Check for addition
-                if input.name + "_add" in incoming:
+                if key + "_add" in incoming:
                     new_state = {}
                     self.fill_in_new_state( trans, input.inputs, new_state, context )
                     group_state.append( new_state )
diff --git a/templates/tool_form.tmpl b/templates/tool_form.tmpl
index 2d88eae4e7e..8febcda57d4 100644
--- a/templates/tool_form.tmpl
+++ b/templates/tool_form.tmpl
@@ -34,10 +34,10 @@
             #end if
             <div class="form-title-row"><b>${input.title} ${i + 1}</b></div>
             $do_inputs( $input.inputs, $repeat_state[$i], $rep_errors, $prefix + $input.name + "_" + str(i) + "|", $context )
-            <div class="form-row"><input type="submit" name="${input.name}_${i}_remove" value="Remove ${input.title} ${i+1}"></div>
+            <div class="form-row"><input type="submit" name="${prefix}${input.name}_${i}_remove" value="Remove ${input.title} ${i+1}"></div>
             </div>
           #end for
-          <div class="form-row"><input type="submit" name="${input.name}_add" value="Add new ${input.title}"></div>
+          <div class="form-row"><input type="submit" name="${prefix}${input.name}_add" value="Add new ${input.title}"></div>
       </div>
     #elif $input.type == "conditional"
       #set group_state = $tool_state[$input.name]