diff --git a/question_types/quiz_question/quiz_question.module b/question_types/quiz_question/quiz_question.module
index db2af6b..dadffc0 100644
--- a/question_types/quiz_question/quiz_question.module
+++ b/question_types/quiz_question/quiz_question.module
@@ -896,3 +896,14 @@ function quiz_question_add_body_field($type) {
   $instance['widget']['settings']['rows'] = 6;
   field_update_instance($instance);
 }
+
+function quiz_question_feedback_finish_form($form, $form_state) {
+  $form['navigation']['#theme'] = 'quiz_question_navigation_form';
+
+  // Add navigation at the bottom:
+  $form['navigation']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('View Results'),
+  );
+  return $form;
+}
diff --git a/quiz.module b/quiz.module
index a8986b9..37da940 100644
--- a/quiz.module
+++ b/quiz.module
@@ -2018,7 +2018,17 @@ function quiz_take_quiz($quiz) {
   }
   // Else we're at the end of quiz.
   else {
-    $quiz_end = TRUE;
+    if (isset($_SESSION['quiz_' . $quiz->nid]['feedback']) && $quiz->feedback_time == QUIZ_FEEDBACK_QUESTION) {
+      $content['body']['question']['#markup'] = drupal_render(drupal_get_form('quiz_question_feedback_finish_form'));
+      $content['body']['question']['#weight'] = 0;
+      $content['body']['feedback']['#markup'] = rawurldecode($_SESSION['quiz_' . $quiz->nid]['feedback']);
+      $content['body']['feedback']['#weight'] = -100;
+      drupal_set_title($quiz->title);
+      unset($_SESSION['quiz_' . $quiz->nid]['feedback']);
+    }
+    else {
+      $quiz_end = TRUE;
+    }
   }
 
   // If we're at the end of the quiz.