diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 241d8d4ba..5b79a6c75 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -737,7 +737,7 @@ class Form extends WidgetBase
                 $this->model->setValidationAttributeName($attrName, $fieldObj->label);
             }
 
-            $this->allFields[$name] = $fieldObj;
+            $this->allFields[$fieldObj->fieldName] = $fieldObj;
 
             switch (strtolower($addToArea)) {
                 case FormTabs::SECTION_PRIMARY: