diff --git a/public/js/quickmenu/carddeck.js b/public/js/quickmenu/carddeck.js
index 0f93b9d..cdd7a09 100644
--- a/public/js/quickmenu/carddeck.js
+++ b/public/js/quickmenu/carddeck.js
@@ -726,9 +726,13 @@ async function createDeck(name) {
     }
     const deck = await res.json();
     await loadDecks();
-    currentDeckId = null;
-    renderDeckSelect();
+
+    // Neues Deck direkt auswählen
+    currentDeckId = deck.id;
     deckCards = [];
+    renderDeckSelect();
+
+    // Deck-Grid leeren + Info setzen
     document.getElementById("kd-deck-grid").innerHTML =
       `<div class="kd-empty-deck">Deck ist leer.<br>Klicke links auf eine Karte um sie hinzuzufügen.</div>`;
     document.getElementById("kd-deck-info").innerHTML =
@@ -857,28 +861,30 @@ function renderPagination(pagination, totalPages, total) {
    EVENTS (Shell-Ebene)
 ══════════════════════════════════════════════ */
 function attachShellEvents() {
-  // Deck-Auswahl
-  document.addEventListener("change", async (e) => {
-    if (e.target.id !== "kd-deck-select") return;
-    const val = parseInt(e.target.value);
-    if (!val) {
-      currentDeckId = null;
-      deckCards = [];
-      document.getElementById("kd-deck-grid").innerHTML =
-        `<div class="kd-empty-deck">Kein Deck ausgewählt.</div>`;
-      document.getElementById("kd-deck-info").innerHTML = "";
-      renderCollectionGrid(document.getElementById("kd-grid"), userCardsCache);
-      return;
-    }
-    currentDeckId = val;
-    await loadDeckCards(currentDeckId);
-  });
+  // Deck-Auswahl – direkt auf Element, kein document-Listener
+  const sel = document.getElementById("kd-deck-select");
+  if (sel) {
+    sel.addEventListener("change", async (e) => {
+      const val = parseInt(e.target.value);
+      if (!val) {
+        currentDeckId = null;
+        deckCards = [];
+        document.getElementById("kd-deck-grid").innerHTML =
+          `<div class="kd-empty-deck">Kein Deck ausgewählt.</div>`;
+        document.getElementById("kd-deck-info").innerHTML = "";
+        renderCollectionGrid(document.getElementById("kd-grid"), userCardsCache);
+        return;
+      }
+      currentDeckId = val;
+      await loadDeckCards(currentDeckId);
+    });
+  }
 
-  // Neues Deck
-  document.addEventListener("click", (e) => {
-    if (e.target.id !== "kd-btn-new-deck") return;
-    showNewDeckModal();
-  });
+  // Neues Deck – direkt auf Button, kein document-Listener
+  const btnNew = document.getElementById("kd-btn-new-deck");
+  if (btnNew) {
+    btnNew.addEventListener("click", () => showNewDeckModal());
+  }
 }
 
 /* ══════════════════════════════════════════════