diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 079a6226967..8f5ad1c75e0 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -852,7 +852,8 @@ class default_questiontype {
 
         if (isset($options->questioncommentlink) && $context && has_capability('mod/quiz:grade', $context)) {
             $strcomment = get_string('commentorgrade', 'quiz');
-            $commentlink = '<div class="commentlink">'.link_to_popup_window ($options->questioncommentlink.'?attempt='.$state->attempt.'&amp;question='.$question->id,
+            $question_to_comment = isset($question->randomquestionid) ? $question->randomquestionid : $question->id;
+            $commentlink = '<div class="commentlink">'.link_to_popup_window ($options->questioncommentlink.'?attempt='.$state->attempt.'&amp;question='.$question_to_comment,
                              'commentquestion', $strcomment, 450, 650, $strcomment, 'none', true).'</div>';
         }
 
diff --git a/question/type/random/questiontype.php b/question/type/random/questiontype.php
index 6aaef2dc1d6..17f80e22a53 100644
--- a/question/type/random/questiontype.php
+++ b/question/type/random/questiontype.php
@@ -258,6 +258,7 @@ class random_qtype extends default_questiontype {
     function print_question(&$question, &$state, &$number, $cmoptions, $options) {
         global $QTYPES;
         $wrappedquestion = &$state->options->question;
+        $wrappedquestion->randomquestionid = $question->id;
         $QTYPES[$wrappedquestion->qtype]
          ->print_question($wrappedquestion, $state, $number, $cmoptions, $options);
     }