diff --git a/question/type/question.html b/question/type/question.html
index 9934db0ffba06..8993752d50376 100644
--- a/question/type/question.html
+++ b/question/type/question.html
@@ -3,21 +3,6 @@
  * print_question() method.
  */
 ?>
-
-<script language="javascript" type="text/javascript">
-    if (typeof showhidecomment == "undefined") {
-        function showhidecomment (id) {
-            divobj = document.getElementById(id);
-            if (divobj.style.display == 'none') {
-                divobj.style.display = 'block';
-            } else {
-                divobj.style.display = 'none';
-            }
-        }
-    }
-</script>
-
-<a name="<?php echo $question->id; ?>" id="<?php echo $question->id; ?>"></a>
 <div id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?> clearfix">
   <div class="info">
     <span class="no"><?php echo $number; ?></span>
@@ -43,18 +28,8 @@
         echo $comment;
       ?>
     </div>
-  <?php } ?>
-  <div class="commentlink">
-      <?php 
-        if (!empty($commentlink)) {
+  <?php }
             echo $commentlink;
-      ?>
-      <div id="comment-wrapper-<?php echo $question->id; ?>">
-          <?php question_print_comment_box($question, $state, $attempt, $CFG->wwwroot.'/mod/quiz/review.php?attempt='.$attempt->id.'#'.$question->id) ?>
-      </div>
-      <?php } ?>
-  </div>      
-  <?php
   if ($history) { ?>
 	<div class="history">
 	  <?php
@@ -64,7 +39,3 @@
 	</div>
   <?php } ?>
 </div>
-
-<script language="javascript" type="text/javascript">
-    showhidecomment('comment-wrapper-<?php echo $question->id; ?>');
-</script>
\ No newline at end of file
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 5f54fe01787f1..a50ff8a99451e 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -478,8 +478,8 @@ function print_question(&$question, &$state, $number, $cmoptions, $options) {
         $commentlink = '';
         if (isset($options->questioncommentlink)) {
             $strcomment = get_string('commentorgrade', 'quiz');
-            $attempt = get_record('quiz_attempts', 'uniqueid', $state->attempt);  // would just have $attempt->uniqueid = $state->attempt but review.php needs $attempt->id
-            $commentlink = "<a href=\"javascript: showhidecomment('comment-wrapper-$question->id');\">$strcomment</a>";
+            $commentlink = '<div class="commentlink">'.link_to_popup_window ($options->questioncommentlink.'?attempt='.$state->attempt.'&amp;question='.$question->id,
+                             'commentquestion', $strcomment, 450, 650, $strcomment, 'none', true).'</div>';
         }
 
         $history = $this->history($question, $state, $number, $cmoptions, $options);