diff --git a/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx b/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx
index ab92993272..c1c86febbc 100644
--- a/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx
+++ b/frontend/components/AuthenticatedAdminRoutes/AuthenticatedAdminRoutes.jsx
@@ -32,9 +32,9 @@ export class AuthenticatedAdminRoutes extends Component {
     }
 
     return (
-      <div>
+      <>
         {children}
-      </div>
+      </>
     );
   }
 }
diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
index 2a05c5251d..0eeb8b8e87 100644
--- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
+++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
@@ -158,7 +158,7 @@ class AppConfigForm extends Component {
     return (
       <form className={baseClass} onSubmit={handleSubmit}>
         <div className={`${baseClass}__section`}>
-          <h2>Organization Info</h2>
+          <h2><a id="organization-info">Organization Info</a></h2>
           <div className={`${baseClass}__inputs`}>
             <InputField
               {...fields.org_name}
@@ -174,7 +174,7 @@ class AppConfigForm extends Component {
           </div>
         </div>
         <div className={`${baseClass}__section`}>
-          <h2>Fleet web address</h2>
+          <h2><a id="fleet-web-address">Fleet web address</a></h2>
           <div className={`${baseClass}__inputs`}>
             <InputField
               {...fields.kolide_server_url}
@@ -188,7 +188,7 @@ class AppConfigForm extends Component {
         </div>
 
         <div className={`${baseClass}__section`}>
-          <h2>SAML Single Sign On Options</h2>
+          <h2><a id="saml">SAML Single Sign On Options</a></h2>
 
           <div className={`${baseClass}__inputs`}>
             <Checkbox
@@ -264,7 +264,9 @@ class AppConfigForm extends Component {
         </div>
 
         <div className={`${baseClass}__section`}>
-          <h2>SMTP Options <small className={`smtp-options smtp-options--${smtpConfigured ? 'configured' : 'notconfigured'}`}>STATUS: <em>{smtpConfigured ? 'CONFIGURED' : 'NOT CONFIGURED'}</em></small></h2>
+          <h2>
+            <a id="smtp">SMTP Options <small className={`smtp-options smtp-options--${smtpConfigured ? 'configured' : 'notconfigured'}`}>STATUS: <em>{smtpConfigured ? 'CONFIGURED' : 'NOT CONFIGURED'}</em></small></a>
+          </h2>
           <div className={`${baseClass}__inputs`}>
             <Checkbox
               {...fields.enable_smtp}
@@ -316,7 +318,7 @@ class AppConfigForm extends Component {
           </div>
         </div>
         <div className={`${baseClass}__section`}>
-          <h2>Osquery Enrollment Secrets</h2>
+          <h2><a id="osquery-enrollment-secrets">Osquery Enrollment Secrets</a></h2>
           <div className={`${baseClass}__inputs`}>
             <p className={`${baseClass}__enroll-secret-label`}>
               Manage secrets with <code>fleetctl</code>. Active secrets:
@@ -325,7 +327,7 @@ class AppConfigForm extends Component {
           </div>
         </div>
         <div className={`${baseClass}__section`}>
-          <h2><a href="#advancedOptions" onClick={onToggleAdvancedOptions} className={`${baseClass}__show-options`}><Header showAdvancedOptions={showAdvancedOptions} /></a></h2>
+          <h2><a id="advanced-options" onClick={onToggleAdvancedOptions} className={`${baseClass}__show-options`}><Header showAdvancedOptions={showAdvancedOptions} /></a></h2>
           {renderAdvancedOptions()}
         </div>
         <Button
diff --git a/frontend/components/forms/admin/AppConfigForm/_styles.scss b/frontend/components/forms/admin/AppConfigForm/_styles.scss
index e064f2d2de..20ea7ac61f 100644
--- a/frontend/components/forms/admin/AppConfigForm/_styles.scss
+++ b/frontend/components/forms/admin/AppConfigForm/_styles.scss
@@ -1,4 +1,5 @@
 .app-config-form {
+
   &__enroll-secret-label {
     font-size: 15px;
 
@@ -32,6 +33,13 @@
     @include clearfix;
     margin: 0 0 30px;
 
+    h2 {
+      a {
+        color: $black;
+        scroll-margin-top: 210px; // used to push down anchor to visible area when there are sticky headers
+      }
+    }
+
     .smtp-options {
       font-size: 15px;
       font-weight: $bold;
diff --git a/frontend/pages/admin/AppSettingsPage/AppSettingsPage.jsx b/frontend/pages/admin/AppSettingsPage/AppSettingsPage.jsx
index 3129e4a0d1..2e924e1134 100644
--- a/frontend/pages/admin/AppSettingsPage/AppSettingsPage.jsx
+++ b/frontend/pages/admin/AppSettingsPage/AppSettingsPage.jsx
@@ -55,13 +55,25 @@ class AppSettingsPage extends Component {
     return (
       <div className={`${baseClass} body-wrap`}>
         <p className={`${baseClass}__page-description`}>Set your organization information, Configure SAML and SMTP, and view host enroll secrets.</p>
-        <AppConfigForm
-          formData={formData}
-          handleSubmit={onFormSubmit}
-          serverErrors={error}
-          smtpConfigured={smtpConfigured}
-          enrollSecret={enrollSecret}
-        />
+        <div className={`${baseClass}__settings-form`}>
+          <nav>
+            <ul className={`${baseClass}__form-nav-list`}>
+              <li><a href="#organization-info">Organization info</a></li>
+              <li><a href="#fleet-web-address">Fleet web address</a></li>
+              <li><a href="#saml">SAML single sign on options</a></li>
+              <li><a href="#smtp">SMTP options</a></li>
+              <li><a href="#osquery-enrollment-secrets">Osquery enrollment secrets</a></li>
+              <li><a href="#advanced-options">Advanced options</a></li>
+            </ul>
+          </nav>
+          <AppConfigForm
+            formData={formData}
+            handleSubmit={onFormSubmit}
+            serverErrors={error}
+            smtpConfigured={smtpConfigured}
+            enrollSecret={enrollSecret}
+          />
+        </div>
       </div>
     );
   }
diff --git a/frontend/pages/admin/AppSettingsPage/_styles.scss b/frontend/pages/admin/AppSettingsPage/_styles.scss
index f90984b1e3..a9618ec914 100644
--- a/frontend/pages/admin/AppSettingsPage/_styles.scss
+++ b/frontend/pages/admin/AppSettingsPage/_styles.scss
@@ -4,7 +4,7 @@
   &__page-description {
     font-size: $x-small;
     color: $core-dark-blue-grey;
-    margin: 40px 0 54px 0;
+    @include sticky-settings-description;
   }
 
   h2 {
@@ -31,4 +31,31 @@
       color: $core-dark-blue-grey;
     }
   }
+
+  &__settings-form {
+    display: flex;
+
+  }
+
+  &__form-nav-list {
+    position: sticky;
+    // this is the spacing needed to make the sticky form nav position correctly when scrolling
+    // TODO: find a way to calculate these sticky positions this and use variables.
+    //  will be tedious to update otherwise.
+    top: 207px;
+    width: 178px;
+    margin: 0;
+    padding: 0 110px 0 0;
+    list-style: none;
+    font-size: $x-small;
+
+    li {
+      margin-bottom: 16px;
+    }
+
+    a {
+      color: $black;
+      text-decoration: none;
+    }
+  }
 }
diff --git a/frontend/pages/admin/OsqueryOptionsPage/OsqueryOptionsPage.jsx b/frontend/pages/admin/OsqueryOptionsPage/OsqueryOptionsPage.jsx
index 248f3ada9d..e951b6c64a 100644
--- a/frontend/pages/admin/OsqueryOptionsPage/OsqueryOptionsPage.jsx
+++ b/frontend/pages/admin/OsqueryOptionsPage/OsqueryOptionsPage.jsx
@@ -63,26 +63,24 @@ export class OsqueryOptionsPage extends Component {
     const { onSaveOsqueryOptionsFormSubmit } = this;
 
     return (
-      <div className={`${baseClass}__page-wrap`}>
-        <div className={`${baseClass} body-wrap`}>
-          <p className={`${baseClass}__page-description`}>This file describes options returned to osquery when it checks for configuration.</p>
-          <div className={`${baseClass}__info-banner`}>
-            <p>See Fleet documentation for an example file that includes the overrides option.</p>
-            <a
-              href="https://github.com/fleetdm/fleet/blob/master/docs/1-Using-Fleet/2-fleetctl-CLI.md#osquery-configuration-options"
-              target="_blank"
-              rel="noreferrer"
-            >
-              Go to Fleet docs
-              <img src={OpenNewTabIcon} alt="open new tab" />
-            </a>
-          </div>
-          <div className={`${baseClass}__form-wrapper`}>
-            <OsqueryOptionsForm
-              formData={formData}
-              handleSubmit={onSaveOsqueryOptionsFormSubmit}
-            />
-          </div>
+      <div className={`${baseClass} body-wrap`}>
+        <p className={`${baseClass}__page-description`}>This file describes options returned to osquery when it checks for configuration.</p>
+        <div className={`${baseClass}__info-banner`}>
+          <p>See Fleet documentation for an example file that includes the overrides option.</p>
+          <a
+            href="https://github.com/fleetdm/fleet/blob/master/docs/1-Using-Fleet/2-fleetctl-CLI.md#osquery-configuration-options"
+            target="_blank"
+            rel="noreferrer"
+          >
+            Go to Fleet docs
+            <img src={OpenNewTabIcon} alt="open new tab" />
+          </a>
+        </div>
+        <div className={`${baseClass}__form-wrapper`}>
+          <OsqueryOptionsForm
+            formData={formData}
+            handleSubmit={onSaveOsqueryOptionsFormSubmit}
+          />
         </div>
       </div>
     );
diff --git a/frontend/pages/admin/OsqueryOptionsPage/_styles.scss b/frontend/pages/admin/OsqueryOptionsPage/_styles.scss
index 0b94b0c972..cf8b73e984 100644
--- a/frontend/pages/admin/OsqueryOptionsPage/_styles.scss
+++ b/frontend/pages/admin/OsqueryOptionsPage/_styles.scss
@@ -10,7 +10,8 @@
   &__page-description {
     font-size: $x-small;
     color: $core-dark-blue-grey;
-    margin: 40px 0 16px 0;
+    @include sticky-settings-description;
+    padding-bottom: $pad-medium;
   }
 
   &__info-banner {
diff --git a/frontend/pages/admin/UserManagementPage/UserManagementPage.jsx b/frontend/pages/admin/UserManagementPage/UserManagementPage.jsx
index 560a7033a3..663220a197 100644
--- a/frontend/pages/admin/UserManagementPage/UserManagementPage.jsx
+++ b/frontend/pages/admin/UserManagementPage/UserManagementPage.jsx
@@ -299,9 +299,7 @@ export class UserManagementPage extends Component {
 
     return (
       <div className={`${baseClass} body-wrap`}>
-        <div className={`${baseClass}__heading-wrapper`}>
-          <p className={`${baseClass}__page-description`}>Invite new users, customize user permissions, and disable users in Fleet.</p>
-        </div>
+        <p className={`${baseClass}__page-description`}>Invite new users, customize user permissions, and disable users in Fleet.</p>
         {renderSmtpWarning()}
         <div className={`${baseClass}__add-user-wrap`}>
           <p className={`${baseClass}__user-count`}>{resourcesCount} users</p>
diff --git a/frontend/pages/admin/UserManagementPage/_styles.scss b/frontend/pages/admin/UserManagementPage/_styles.scss
index a2ccc67f68..66e832ca9b 100644
--- a/frontend/pages/admin/UserManagementPage/_styles.scss
+++ b/frontend/pages/admin/UserManagementPage/_styles.scss
@@ -1,11 +1,11 @@
 .user-management {
-  min-height: 90vh;
   padding: 30px;
 
   &__page-description {
     font-size: $x-small;
     color: $core-dark-blue-grey;
-    margin: 40px 0 20px 0;
+    @include sticky-settings-description;
+    padding-bottom: $pad-medium;
   }
 
   &__wrapper {
@@ -61,7 +61,6 @@
 
   &__heading-wrapper {
     width: 100%;
-    margin-bottom: 10px;
   }
 
   &__smtp-warning-wrapper {
diff --git a/frontend/styles/var/mixins.scss b/frontend/styles/var/mixins.scss
index 7292735aec..b4445a3811 100644
--- a/frontend/styles/var/mixins.scss
+++ b/frontend/styles/var/mixins.scss
@@ -24,3 +24,15 @@ $max-width: 2560px;
     @content;
   }
 }
+
+//  Used to keep the settings description sticky under the main nav and sub nav.
+// TODO: figure out how to calculate these values with variables. Will be tedious to change otherwise
+@mixin sticky-settings-description {
+  position: sticky;
+  // this is the current spacing needed to keep the description looking correct under the sub nav when scrolling.
+  top: 97px;
+  z-index: 2;
+  background-color: $white;
+  margin: 0;
+  padding: 40px 0 54px 0;
+}