diff --git a/src/pages/Settings/Settings.module.scss b/src/pages/Settings/Settings.module.scss
index ec4ca31..291d500 100644
--- a/src/pages/Settings/Settings.module.scss
+++ b/src/pages/Settings/Settings.module.scss
@@ -122,6 +122,33 @@
   }
 }
 
+.retryRowAligned {
+  align-items: flex-start;
+
+  .retryButton {
+    margin-top: calc(1.5em + #{$spacing-xs});
+  }
+
+  @include mobile {
+    align-items: stretch;
+
+    .retryButton {
+      margin-top: 0;
+    }
+  }
+}
+
+.retryRowInputGrow {
+  :global(.form-group) {
+    flex: 1 1 0;
+    min-width: 0;
+  }
+
+  .retryInput {
+    width: 100%;
+  }
+}
+
 .retryInput {
   width: 140px;
 
diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx
index aadd4ef..5588342 100644
--- a/src/pages/SettingsPage.tsx
+++ b/src/pages/SettingsPage.tsx
@@ -371,7 +371,7 @@ export function SettingsPage() {
       </Card>
 
       <Card title={t('basic_settings.logs_max_total_size_title')}>
-        <div className={styles.retryRow}>
+        <div className={`${styles.retryRow} ${styles.retryRowAligned} ${styles.retryRowInputGrow}`}>
           <Input
             label={t('basic_settings.logs_max_total_size_label')}
             hint={t('basic_settings.logs_max_total_size_hint')}
@@ -396,7 +396,7 @@ export function SettingsPage() {
       </Card>
 
       <Card title={t('basic_settings.routing_title')}>
-        <div className={styles.retryRow}>
+        <div className={`${styles.retryRow} ${styles.retryRowAligned} ${styles.retryRowInputGrow}`}>
           <div className="form-group">
             <label>{t('basic_settings.routing_strategy_label')}</label>
             <select