diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 645dd39..a53a3dd 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -710,11 +710,17 @@
         compact
       >
         <template #actions>
-          <div class="session-box">
-            <span>{{ me?.email || "Session loading" }}</span>
-            <GnBadge :variant="me?.role === 'admin' ? 'warning' : 'info'">
-              {{ me?.role || "user" }}
-            </GnBadge>
+          <div class="header-actions">
+            <div class="search-line header-search">
+              <GnSearchField v-model="query" placeholder="service, login, tag, source" />
+              <GnButton variant="primary" icon="ph ph-magnifying-glass" @click="loadSecrets">Search</GnButton>
+            </div>
+            <div class="session-box">
+              <span>{{ me?.email || "Session loading" }}</span>
+              <GnBadge :variant="me?.role === 'admin' ? 'warning' : 'info'">
+                {{ me?.role || "user" }}
+              </GnBadge>
+            </div>
           </div>
         </template>
       </GnPageHeader>
@@ -724,22 +730,6 @@
       <GnTabs v-model="activeTab" :items="tabs" />
     </nav>
 
-    <section class="metrics-row" aria-label="Overview">
-      <GnMetricCard label="Total" :value="total" icon="ph ph-vault" />
-      <GnMetricCard label="Active" :value="activeSecrets" icon="ph ph-check-circle" />
-      <GnMetricCard label="MCP" :value="mcpSecrets" icon="ph ph-plugs-connected" />
-      <section class="workspace-surface search-surface" aria-label="Search">
-        <GnToolbar title="Search">
-          <template #actions>
-            <div class="search-line">
-              <GnSearchField v-model="query" placeholder="service, login, tag, source" />
-              <GnButton variant="primary" icon="ph ph-magnifying-glass" @click="loadSecrets">Search</GnButton>
-            </div>
-          </template>
-        </GnToolbar>
-      </section>
-    </section>
-
     <section v-if="activeTab === 'secrets'" class="secrets-page">
       <section v-if="secretsView === 'list'" class="workspace-surface list-panel">
         <p v-if="error" class="error">{{ error }}</p>
@@ -939,6 +929,11 @@
     </section>
 
     <section v-if="activeTab === 'settings'" class="panel-stack">
+      <section class="settings-metrics" aria-label="Storage overview">
+        <GnMetricCard label="Total" :value="total" icon="ph ph-vault" />
+        <GnMetricCard label="Active" :value="activeSecrets" icon="ph ph-check-circle" />
+        <GnMetricCard label="MCP" :value="mcpSecrets" icon="ph ph-plugs-connected" />
+      </section>
       <section class="workspace-surface">
         <GnToolbar title="Settings" />
         <GnFileUpload
diff --git a/frontend/src/styles.css b/frontend/src/styles.css
index 5deb227..cdf5be6 100644
--- a/frontend/src/styles.css
+++ b/frontend/src/styles.css
@@ -38,13 +38,6 @@
   margin: 14px 0;
 }
 
-.metrics-row {
-  display: grid;
-  grid-template-columns: repeat(3, minmax(120px, 170px)) minmax(520px, 1fr);
-  gap: 15px;
-  margin-bottom: 15px;
-}
-
 .list-panel,
 .detail-panel,
 .token-panel {
@@ -66,10 +59,6 @@
   background: rgba(22, 22, 30, 0.28);
 }
 
-.search-surface {
-  align-content: start;
-}
-
 @media (hover: hover) and (pointer: fine) {
   .card:hover {
     background: rgba(192, 202, 245, 0.045);
@@ -118,6 +107,18 @@
   min-width: 220px;
 }
 
+.header-actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 14px;
+  min-width: 0;
+}
+
+.header-search {
+  min-width: min(520px, 42vw);
+}
+
 .secrets-page {
   display: grid;
   gap: 15px;
@@ -131,6 +132,12 @@
   max-width: 960px;
 }
 
+.settings-metrics {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(120px, 170px));
+  gap: 15px;
+}
+
 .list-panel {
   overflow: auto;
 }
@@ -307,8 +314,14 @@
 }
 
 @media (max-width: 1260px) {
-  .metrics-row {
-    grid-template-columns: 1fr;
+  .header-actions {
+    width: 100%;
+    align-items: stretch;
+    flex-direction: column-reverse;
+  }
+
+  .header-search {
+    min-width: 0;
   }
 
   .list-panel {
@@ -327,6 +340,10 @@
     flex-direction: column;
   }
 
+  .settings-metrics {
+    grid-template-columns: 1fr;
+  }
+
   .form-grid.two,
   .create-field-row,
   .create-access-grid {