diff --git a/quiz.module b/quiz.module
index e6a0764..4c0a2f1 100644
--- a/quiz.module
+++ b/quiz.module
@@ -3549,6 +3549,15 @@ function quiz_access_question($quiz, $question_number) {
   $question_node = node_load($qinfo['nid'], $qinfo['vid']);
   $question_node_last = node_load($qinfo_last['nid'], $qinfo_last['vid']);
 
+  if ($_POST) {
+    // @kludge workaround for a double click
+    $qinfo_current = $quiz_result->layout[$_SESSION['quiz'][$quiz->nid]['current']];
+    if ($question_node->nid != $qinfo_current['nid']) {
+      // Go to the current question.
+      drupal_goto("node/$quiz->nid/take/" . $_SESSION['quiz'][$quiz->nid]['current']);
+    }
+  }
+
   if (!$quiz->backwards_navigation) {
     // No backwards navigation.
     if (quiz_result_is_question_answered($quiz_result, $question_node)) {