diff --git a/changes/issue-4499-align-buttons b/changes/issue-4499-align-buttons
new file mode 100644
index 0000000000..132b8dd156
--- /dev/null
+++ b/changes/issue-4499-align-buttons
@@ -0,0 +1 @@
+* Fix misaligned buttons on app settings page
diff --git a/frontend/components/forms/admin/AppConfigForm/_styles.scss b/frontend/components/forms/admin/AppConfigForm/_styles.scss
index cfef1ddeff..056197b683 100644
--- a/frontend/components/forms/admin/AppConfigForm/_styles.scss
+++ b/frontend/components/forms/admin/AppConfigForm/_styles.scss
@@ -50,9 +50,12 @@
   }
 
   .form-field {
+    width: 100%;
+
     &__label {
       font-weight: $bold;
       margin-bottom: $pad-xsmall;
+      width: 100%;
     }
 
     &__hint {
diff --git a/frontend/pages/admin/AppSettingsPage/_styles.scss b/frontend/pages/admin/AppSettingsPage/_styles.scss
index 53138dd94c..44c9f4fdf7 100644
--- a/frontend/pages/admin/AppSettingsPage/_styles.scss
+++ b/frontend/pages/admin/AppSettingsPage/_styles.scss
@@ -61,6 +61,15 @@
 
   // so tooltips won't be triggered with whitespace
   .form-field__label {
-    display: inline-block; 
+    display: inline-block;
+
+    .buttons {
+      top: 22px;
+    }
+    .enroll-secrets__secret-input {
+      .input-field {
+        width: 100%;
+      }
+    }
   }
 }