diff --git a/lib/WebGUI/FormBuilder/Role/HasFields.pm b/lib/WebGUI/FormBuilder/Role/HasFields.pm
index 1503f7cd7..458f540ec 100644
--- a/lib/WebGUI/FormBuilder/Role/HasFields.pm
+++ b/lib/WebGUI/FormBuilder/Role/HasFields.pm
@@ -82,10 +82,11 @@ Delete a field by name. Returns the field deleted.
 sub deleteField {
     my ( $self, $name ) = @_;
     my $field    = delete $self->{_fieldsByName}{$name};
-    for ( my $i = 0; $i < scalar @{$self->fields}; $i++ ) {
+    FIELD: for ( my $i = 0; $i < scalar @{$self->fields}; $i++ ) {
         my $testField    = $self->fields->[$i];
         if ( $testField->get('name') eq $name ) {
             splice @{$self->fields}, $i, 1;
+            last FIELD;
         }
     }
     return $field;