diff --git a/ui/src/pages/AgentHealth/AgentHealth.tsx b/ui/src/pages/AgentHealth/AgentHealth.tsx
index 68855210..c3f1ce04 100644
--- a/ui/src/pages/AgentHealth/AgentHealth.tsx
+++ b/ui/src/pages/AgentHealth/AgentHealth.tsx
@@ -647,6 +647,28 @@ export default function AgentHealth() {
       )}
 
 
+      {/* View toolbar — hidden on app detail page */}
+      {!isFullWidth && (
+        <div className={styles.viewToolbar}>
+          <div className={styles.viewToggle}>
+            <button
+              className={`${styles.viewToggleBtn} ${viewMode === 'compact' ? styles.viewToggleBtnActive : ''}`}
+              onClick={() => toggleViewMode('compact')}
+              title="Compact view"
+            >
+              <LayoutGrid size={14} />
+            </button>
+            <button
+              className={`${styles.viewToggleBtn} ${viewMode === 'expanded' ? styles.viewToggleBtnActive : ''}`}
+              onClick={() => toggleViewMode('expanded')}
+              title="Expanded view"
+            >
+              <List size={14} />
+            </button>
+          </div>
+        </div>
+      )}
+
       {/* Group cards grid */}
       {viewMode === 'expanded' || isFullWidth ? (
         <div className={isFullWidth ? styles.groupGridSingle : styles.groupGrid}>
@@ -705,25 +727,6 @@ export default function AgentHealth() {
           ))}
         </div>
       ) : (
-        <>
-        <div className={styles.viewToolbar}>
-          <div className={styles.viewToggle}>
-            <button
-              className={`${styles.viewToggleBtn} ${styles.viewToggleBtnActive}`}
-              onClick={() => toggleViewMode('compact')}
-              title="Compact view"
-            >
-              <LayoutGrid size={14} />
-            </button>
-            <button
-              className={styles.viewToggleBtn}
-              onClick={() => toggleViewMode('expanded')}
-              title="Expanded view"
-            >
-              <List size={14} />
-            </button>
-          </div>
-        </div>
         <div className={styles.compactGrid}>
           {groups.map((group) => (
             <div key={group.appId} className={styles.compactGridCell}>
@@ -824,7 +827,6 @@ export default function AgentHealth() {
             </div>
           ))}
         </div>
-        </>
       )}
 
       {/* Log + Timeline side by side */}