diff --git a/django/templates/play/game/question_host.html b/django/templates/play/game/question_host.html
index ae4f894..41b7ea1 100644
--- a/django/templates/play/game/question_host.html
+++ b/django/templates/play/game/question_host.html
@@ -1,14 +1,19 @@
 {% extends 'base.html' %}
 {% block content %}
 
-{% if request.session.mode == "learn" %}
+
 
 <div class="container mx-auto px-4">
     <div class="flex justify-end mb-4">
+        {% if request.session.mode == "learn" %}
         <button onclick="leaveGame()" class="bg-red-500 hover:bg-red-600 text-white font-bold py-2 px-4 rounded">
             Spiel verlassen
         </button>
-    </div>{% endif %}
+        {% endif %}
+        <button onclick="this.onclick=null; advanceToScores();" class="mx-2 bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded">
+            weiter
+        </button>
+    </div>
     <div id="form_host" class="bg-white rounded-lg shadow-md p-4 mb-6">
         <div class="flex justify-between mb-2">
             <div class="flex gap-1 text-sm"><p class="text-sm">Frage</p>
@@ -153,6 +158,7 @@
             optionElement.textContent = `${optionCounts[optionIndex]} Antworten`;
         }
     }
+    
 
     function advanceToScores() {
         // Show correct answers and answer counts
diff --git a/django/templates/play/game/question_participant.html b/django/templates/play/game/question_participant.html
index 1fc86e7..8f6b018 100644
--- a/django/templates/play/game/question_participant.html
+++ b/django/templates/play/game/question_participant.html
@@ -89,6 +89,7 @@
             data.action === 'show_scores' && 
             data.redirect_url) {
             window.location.href = data.redirect_url;
+            submitAnswer( -1 );
         }
     };
 
diff --git a/django/templates/play/game/score_overview.html b/django/templates/play/game/score_overview.html
index db054d7..fad6d1e 100644
--- a/django/templates/play/game/score_overview.html
+++ b/django/templates/play/game/score_overview.html
@@ -344,7 +344,7 @@ if (antwortRichtig) {
                 'type': 'next_question',
                 'host_id': hostId
             }));
-        });
+        }, { once: true });
     }
     {% endif %}
     {% endif %}