diff --git a/wwwroot/css/dashboard.css b/wwwroot/css/dashboard.css
index 484f1c3..67ac693 100644
--- a/wwwroot/css/dashboard.css
+++ b/wwwroot/css/dashboard.css
@@ -104,9 +104,9 @@
 /* Card Menu */
 
 .card-menu {
-  position: absolute;
-  top: var(--badge-spacing);
-  right: var(--badge-spacing);
+  position: relative;
+  margin-left: auto;
+  flex-shrink: 0;
   z-index: 10;
 }
 
diff --git a/wwwroot/js/pages/dashboard.js b/wwwroot/js/pages/dashboard.js
index 8c19904..12fc3b5 100644
--- a/wwwroot/js/pages/dashboard.js
+++ b/wwwroot/js/pages/dashboard.js
@@ -29,6 +29,13 @@ registerPage('dashboard', {
           <div class="card-title-row">
             <span class="card-title">${esc(s.name || 'Unbenannt')}</span>
             ${agent ? `<span class="badge">${esc(agent.name)}</span>` : ''}
+            <div class="card-menu">
+              <button class="card-menu-trigger icon-btn"><i class="fa fa-ellipsis-v"></i></button>
+              <div class="card-menu-dropdown" hidden>
+                <button class="card-menu-item" data-action="chat">Chat öffnen</button>
+                <button class="card-menu-item" data-action="edit">Bearbeiten</button>
+              </div>
+            </div>
           </div>
           ${s.description ? `<div class="card-desc">${esc(s.description)}</div>` : ''}
           <div class="card-meta">
@@ -36,13 +43,6 @@ registerPage('dashboard', {
             ${workspaceLabel ? `<span class="card-meta-item card-workspace" title="${esc(workspaceLabel)}"><i class="fa fa-folder"></i> ${esc(workspaceLabel)}</span>` : ''}
           </div>
         </div>
-        <div class="card-menu">
-          <button class="card-menu-trigger icon-btn"><i class="fa fa-ellipsis-v"></i></button>
-          <div class="card-menu-dropdown" hidden>
-            <button class="card-menu-item" data-action="chat">Chat öffnen</button>
-            <button class="card-menu-item" data-action="edit">Bearbeiten</button>
-          </div>
-        </div>
       `;
       const menuTrigger = card.querySelector('.card-menu-trigger');
       const menuDropdown = card.querySelector('.card-menu-dropdown');
@@ -122,16 +122,16 @@ registerPage('dashboard', {
           <div class="card-title-row">
             <span class="card-title">${esc(a.name)}</span>
             <span class="badge">${esc(a.model)}</span>
+            <div class="card-menu">
+              <button class="card-menu-trigger icon-btn"><i class="fa fa-ellipsis-v"></i></button>
+              <div class="card-menu-dropdown" hidden>
+                <button class="card-menu-item" data-action="edit">Bearbeiten</button>
+              </div>
+            </div>
           </div>
           ${a.description ? `<div class="card-desc">${esc(a.description)}</div>` : ''}
           ${a.persona ? `<div class="card-meta"><span class="card-meta-item card-persona"><i class="fa fa-user-secret"></i> ${esc(a.persona)}</span></div>` : ''}
         </div>
-        <div class="card-menu">
-          <button class="card-menu-trigger icon-btn"><i class="fa fa-ellipsis-v"></i></button>
-          <div class="card-menu-dropdown" hidden>
-            <button class="card-menu-item" data-action="edit">Bearbeiten</button>
-          </div>
-        </div>
       `;
       const menuTrigger = card.querySelector('.card-menu-trigger');
       const menuDropdown = card.querySelector('.card-menu-dropdown');