diff --git a/ui/src/pages/AgentHealth/AgentHealth.module.css b/ui/src/pages/AgentHealth/AgentHealth.module.css
index 64bd44b1..f83dfec6 100644
--- a/ui/src/pages/AgentHealth/AgentHealth.module.css
+++ b/ui/src/pages/AgentHealth/AgentHealth.module.css
@@ -106,6 +106,7 @@
   line-height: 1;
   display: inline-flex;
   align-self: flex-end;
+  margin-left: auto;
 }
 
 .configEditBtn:hover {
diff --git a/ui/src/pages/AgentHealth/AgentHealth.tsx b/ui/src/pages/AgentHealth/AgentHealth.tsx
index 66566a77..458fcb96 100644
--- a/ui/src/pages/AgentHealth/AgentHealth.tsx
+++ b/ui/src/pages/AgentHealth/AgentHealth.tsx
@@ -572,7 +572,6 @@ export default function AgentHealth() {
             </>
           ) : (
             <>
-              <button className={styles.configEditBtn} title="Edit config" onClick={startConfigEdit}>&#x270E;</button>
               <div className={styles.configField}>
                 <span className={styles.configLabel}>Log Level</span>
                 <Badge label={appConfig.logForwardingLevel ?? 'INFO'} color={
@@ -600,6 +599,7 @@ export default function AgentHealth() {
                 <span className={styles.configLabel}>Metrics</span>
                 <Badge label={appConfig.metricsEnabled ? 'On' : 'Off'} color={appConfig.metricsEnabled ? 'success' : 'error'} variant="filled" />
               </div>
+              <button className={styles.configEditBtn} title="Edit config" onClick={startConfigEdit}>&#x270E;</button>
             </>
           )}
         </div>