diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index f4b489ad..208bd398 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -12,6 +12,11 @@
 <h2>Marking question <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}"
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
 
+        {% if not next_unmarked_id and not unmarked %}
+        <div class="alert alert-info" role="alert">Success! Marking question complete. <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking
+            overview</a></div>
+{% endif %}
+
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
 <div>
     <details open title="click to view/hide the mark scheme">