diff --git a/frontend/pages/admin/AppSettingsPage/_styles.scss b/frontend/pages/admin/AppSettingsPage/_styles.scss
index fb7195b591..40962076ec 100644
--- a/frontend/pages/admin/AppSettingsPage/_styles.scss
+++ b/frontend/pages/admin/AppSettingsPage/_styles.scss
@@ -177,6 +177,10 @@
     .app-config-form__section-description {
       width: initial;
     }
+
+    h2 {
+      max-width: initial;
+    }
   }
 
   &__inputs {
@@ -193,12 +197,16 @@
       margin: 0 0 $pad-medium;
 
       .form-field {
-        width: 18%;
+        width: 29%;
         float: right;
 
         &:first-child {
           float: left;
-          width: 78%;
+          width: 69%;
+        }
+
+        &:nth-child(2) {
+          padding-top: 10px;
         }
 
         &--checkbox {
diff --git a/frontend/pages/admin/AppSettingsPage/cards/Agents/Agents.tsx b/frontend/pages/admin/AppSettingsPage/cards/Agents/Agents.tsx
index 802e7b4524..74802c9b29 100644
--- a/frontend/pages/admin/AppSettingsPage/cards/Agents/Agents.tsx
+++ b/frontend/pages/admin/AppSettingsPage/cards/Agents/Agents.tsx
@@ -64,8 +64,8 @@ const Agents = ({
   return (
     <form className={baseClass} onSubmit={onFormSubmit} autoComplete="off">
       <div className={`${baseClass}__section`}>
-        <h2>Global agent options</h2>
         <div className={`${baseClass}__yaml`}>
+          <h2>Global agent options</h2>
           <p className={`${baseClass}__section-description`}>
             This code will be used by osquery when it checks for configuration
             options.