diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index ea4b9c7..f1c8236 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -307,10 +307,10 @@
                         <div class="d-flex gap-2 mb-3">
                             <button id="commitYes" class="btn flex-fill"
                                 :class="{'btn-success': !committed, 'btn-success disabled': committed == 'YES',  'btn-outline-success opacity-75' : committed == 'NO', 'disabled': working}"
-                                @click="submitCommit('YES')" autofocus>Ja, ich bin dabei!</button>
+                                @click="submitCommit('YES')" :autofocus="!committed || committed == 'YES'" tabindex="0">Ja, ich bin dabei!</button>
                             <button id="commitNo" class="btn flex-fill"
                                 :class="{'btn-danger': !committed, 'btn-danger disabled': committed == 'NO', 'btn-outline-danger opacity-75' : committed == 'YES', 'disabled': working}"
-                                @click="submitCommit('NO')">Nein, ich bin nicht dabei</button>
+                                @click="submitCommit('NO')" :autofocus="!committed || committed == 'NO'" tabindex="1">Nein, ich bin nicht dabei</button>
                         </div>
 
                         <!-- Share Buttons -->