diff --git a/frontend/src/views/OfficialTournaments.vue b/frontend/src/views/OfficialTournaments.vue
index 4980838..70fcf7b 100644
--- a/frontend/src/views/OfficialTournaments.vue
+++ b/frontend/src/views/OfficialTournaments.vue
@@ -328,14 +328,14 @@
           <button class="btn-secondary" @click="deselectAllMembers">Alle abwählen</button>
           <div style="flex:1;"></div>
           <button class="btn-secondary" @click="closeMemberDialog">Schließen</button>
-          <button class="btn-primary" :disabled="!selectedMemberIds.length" @click="generateMembersPdf; closeMemberDialog()">PDF erzeugen</button>
+          <button class="btn-primary" :disabled="!selectedMemberIds.length" @click="generateMembersPdfAndClose">PDF erzeugen</button>
         </div>
         <div class="modal-body">
           <div class="dialog-layout">
             <div class="dialog-col members-col">
               <div class="checkbox-column">
-                <label v-for="m in activeMembers" :key="m.id" class="check-item" @click="selectedMemberIdForDialog = m.id">
-                  <input type="checkbox" :value="m.id" v-model="selectedMemberIds" />
+                <label v-for="m in activeMembers" :key="m.id" class="check-item">
+                  <input type="checkbox" :value="m.id" v-model="selectedMemberIds" @change="selectedMemberIdForDialog = m.id" />
                   <span :class="{ active: selectedMemberIdForDialog === m.id }">{{ m.firstName }} {{ m.lastName }}</span>
                 </label>
               </div>
@@ -977,6 +977,10 @@ export default {
       }
       pdf.save('turnier_mitglieder.pdf');
     },
+    async generateMembersPdfAndClose() {
+      await this.generateMembersPdf();
+      this.closeMemberDialog();
+    },
     // Eligibility: Datum parsen (dd.mm.yyyy | yyyy-mm-dd | ISO)
     parseDateFlexible(s) {
       if (!s || typeof s !== 'string') return null;