diff --git a/sbas/templates/sbas/exam_take.html b/sbas/templates/sbas/exam_take.html
index e389a2f8..6e8f2015 100755
--- a/sbas/templates/sbas/exam_take.html
+++ b/sbas/templates/sbas/exam_take.html
@@ -47,6 +47,10 @@ CID: {{cid}}
                 $(el).addClass("selected")
             })
         })
+
+        {% if saved_answer %}
+            $("ul.answerlist li[data-ans='{{saved_answer}}']").addClass("selected");
+        {% endif %}
     })
 </script>
 {% endblock %}
diff --git a/sbas/views.py b/sbas/views.py
index 5fd92949..4af0afb5 100644
--- a/sbas/views.py
+++ b/sbas/views.py
@@ -280,6 +280,10 @@ def exam_take(request, pk, sk, cid):
     if sk == exam_length - 1:
         next = False
 
+    saved_answer = False
+    if answer is not None:
+        saved_answer = answer.answer
+
 
     return render(
         request,