diff --git a/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx b/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
index 7630e36653..67919b1376 100644
--- a/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
+++ b/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
@@ -3,27 +3,30 @@ import PropTypes from 'prop-types';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { ActionGroup, Button } from '@patternfly/react-core';
+import { FormFullWidthLayout } from '@components/FormLayout';
 
 const FormActionGroup = ({ onSubmit, submitDisabled, onCancel, i18n }) => (
-  <ActionGroup>
-    <Button
-      aria-label={i18n._(t`Save`)}
-      variant="primary"
-      type="submit"
-      onClick={onSubmit}
-      isDisabled={submitDisabled}
-    >
-      {i18n._(t`Save`)}
-    </Button>
-    <Button
-      aria-label={i18n._(t`Cancel`)}
-      variant="secondary"
-      type="button"
-      onClick={onCancel}
-    >
-      {i18n._(t`Cancel`)}
-    </Button>
-  </ActionGroup>
+  <FormFullWidthLayout>
+    <ActionGroup>
+      <Button
+        aria-label={i18n._(t`Save`)}
+        variant="primary"
+        type="submit"
+        onClick={onSubmit}
+        isDisabled={submitDisabled}
+      >
+        {i18n._(t`Save`)}
+      </Button>
+      <Button
+        aria-label={i18n._(t`Cancel`)}
+        variant="secondary"
+        type="button"
+        onClick={onCancel}
+      >
+        {i18n._(t`Cancel`)}
+      </Button>
+    </ActionGroup>
+  </FormFullWidthLayout>
 );
 
 FormActionGroup.propTypes = {
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index 73cebca828..c589d92410 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -9,11 +9,7 @@ import FormActionGroup from '@components/FormActionGroup/FormActionGroup';
 import AnsibleSelect from '@components/AnsibleSelect';
 import { required } from '@util/validators';
 import OrganizationLookup from '@components/Lookup/OrganizationLookup';
-import {
-  FormColumnLayout,
-  FormFullWidthLayout,
-  SubFormLayout,
-} from '@components/FormLayout';
+import { FormColumnLayout, SubFormLayout } from '@components/FormLayout';
 import { ManualSubForm, SourceControlSubForm } from './CredentialSubForms';
 
 function CredentialFormFields({
@@ -50,7 +46,7 @@ function CredentialFormFields({
   };
 
   return (
-    <FormFullWidthLayout>
+    <>
       <FormField
         id="credential-name"
         label={i18n._(t`Name`)}
@@ -113,7 +109,7 @@ function CredentialFormFields({
             }
           </SubFormLayout>
         )}
-    </FormFullWidthLayout>
+    </>
   );
 }