diff --git a/sbas/templates/sbas/exam_finish.html b/sbas/templates/sbas/exam_finish.html
index 13706401..d4d4ebd8 100644
--- a/sbas/templates/sbas/exam_finish.html
+++ b/sbas/templates/sbas/exam_finish.html
@@ -6,10 +6,10 @@ CID: {{cid}}
 <h2>Exam: {{exam.name}}</h2>
 
 <div><p>Questions</p></div>
-{{answer_count}} out of {exam_count} questions answered.
+{{answer_count}} out of {{exam_count}} questions answered. Click to go to question.
 <ul class="question-list">
 {% for question, answer in question_answer_tuples %}
-    <li class="">{{forloop.counter}}: {{answer.answer}}</li>
+    <li class=""><a href="{% url sbas:exam_take pk=exam.id sk=forloop.counter0 cid=cid">{{forloop.counter}}: {{answer.answer}}</a></li>
 {% endfor %}
 </ul>
 
diff --git a/sbas/views.py b/sbas/views.py
index 55d3df9f..77d25637 100644
--- a/sbas/views.py
+++ b/sbas/views.py
@@ -263,6 +263,7 @@ def exam_finish(request, pk, cid):
         "sbas/exam_finish.html",
         {
             "exam": exam,
+            "cid": cid,
             "question_answer_tuples": question_answer_tuples,
             "answer_count": len(answers),
             "exam_length": len(questions),