diff --git a/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx b/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
index 13ec5dc11c..877aa2be35 100644
--- a/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
@@ -48,10 +48,10 @@ const SettingGroup = withI18n()(
     <FormGroup
       fieldId={fieldId}
       helperTextInvalid={helperTextInvalid}
+      id={`${fieldId}-field`}
       isRequired={isRequired}
       label={label}
       validated={validated}
-      id={fieldId}
       labelIcon={
         <>
           <Popover