diff --git a/templates/gamemodes.html b/templates/gamemodes.html
index 12d5ca9..1b7acd0 100644
--- a/templates/gamemodes.html
+++ b/templates/gamemodes.html
@@ -65,6 +65,12 @@
       <button class="gamemode-btn" type="submit">{{ translations['quiz_mode'] if translations['quiz_mode'] else 'Quiz Mode' }}</button>
       <div class="gamemode-desc">{{ translations['quiz_mode_desc'] if translations['quiz_mode_desc'] else 'Classic music quiz.' }}</div>
     </form>
+    <form method="get" action="{{ url_for('playerselect', playlist_id=playlist_id) }}">
+      <input type="hidden" name="mode" value="title">
+      <input type="hidden" name="buzzer" value="1">
+      <button class="gamemode-btn" type="submit">{{ translations['buzzer_mode'] if translations['buzzer_mode'] else '🔴 Buzzer Mode' }}</button>
+      <div class="gamemode-desc">{{ translations['buzzer_mode_desc'] if translations['buzzer_mode_desc'] else 'Schnelligkeit zählt! Je schneller du antwortest, desto mehr Punkte bekommst du.' }}</div>
+    </form>
     <button class="gamemode-btn disabled" disabled>Battle Mode</button>
     <div class="gamemode-desc">Coming soon!</div>
     <button class="gamemode-btn disabled" disabled>Party Mode</button>
diff --git a/templates/playerselect.html b/templates/playerselect.html
index a5070af..b73050e 100644
--- a/templates/playerselect.html
+++ b/templates/playerselect.html
@@ -62,18 +62,18 @@
     <h2>{{ translations['quiz_title'] }} – Player Selection</h2>
     <form method="get" action="{{ url_for('quiz', playlist_id=playlist_id) }}">
       <input type="hidden" name="mode" value="{{ game_mode }}">
+      {% if request.args.get('buzzer') == '1' %}
+        <input type="hidden" name="buzzer" value="1">
+      {% endif %}
       <button class="player-btn" type="submit">{{ translations['singleplayer'] }}</button>
       <div class="player-desc">{{ translations['singleplayer_desc'] if translations['singleplayer_desc'] else 'Play alone and test your knowledge.' }}</div>
     </form>
-    <form method="get" action="{{ url_for('quiz', playlist_id=playlist_id) }}">
-      <input type="hidden" name="mode" value="{{ game_mode }}">
-      <input type="hidden" name="buzzer" value="1">
-      <button class="player-btn" type="submit">{{ translations['buzzer_mode'] if translations['buzzer_mode'] else '🔴 Buzzer Mode' }}</button>
-      <div class="player-desc">{{ translations['buzzer_mode_desc'] if translations['buzzer_mode_desc'] else 'Punkte nehmen mit der Zeit ab. Schnell sein zahlt sich aus!' }}</div>
-    </form>
     <form method="get" action="{{ url_for('quiz', playlist_id=playlist_id) }}">
       <input type="hidden" name="mode" value="{{ game_mode }}">
       <input type="hidden" name="local_multiplayer" value="1">
+      {% if request.args.get('buzzer') == '1' %}
+        <input type="hidden" name="buzzer" value="1">
+      {% endif %}
       <button class="player-btn" type="submit">{{ translations['local_multiplayer'] }}</button>
       <div class="player-desc">Spiele mit bis zu 4 Personen an einem Gerät.</div>
     </form>