diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index a0cf904ab2..53c2b55f30 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -179,11 +179,19 @@ class JobTemplateEdit extends Component {
     const canEdit = template.summary_fields.user_capabilities.edit;
 
     if (hasContentLoading) {
-      return <ContentLoading />;
+      return (
+        <CardBody>
+          <ContentLoading />
+        </CardBody>
+      );
     }
 
     if (contentError) {
-      return <ContentError error={contentError} />;
+      return (
+        <CardBody>
+          <ContentError error={contentError} />
+        </CardBody>
+      );
     }
 
     if (!canEdit) {
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index bffdf85cef..88be879390 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -7,7 +7,6 @@ import { withFormik, Field } from 'formik';
 import {
   Form,
   FormGroup,
-  Card,
   Switch,
   Checkbox,
   TextInput,
@@ -165,19 +164,11 @@ class JobTemplateForm extends Component {
     }
 
     if (hasContentLoading) {
-      return (
-        <Card className="awx-c-card">
-          <ContentLoading />
-        </Card>
-      );
+      return <ContentLoading />;
     }
 
     if (contentError) {
-      return (
-        <Card className="awx-c-card">
-          <ContentError error={contentError} />
-        </Card>
-      );
+      return <ContentError error={contentError} />;
     }
     const AdvancedFieldsWrapper = template.isNew ? CollapsibleSection : 'div';
     return (