diff --git a/mod/quiz/questiontypes/description/questiontype.php b/mod/quiz/questiontypes/description/questiontype.php
index e6d0a698a1d..a1d856b0574 100644
--- a/mod/quiz/questiontypes/description/questiontype.php
+++ b/mod/quiz/questiontypes/description/questiontype.php
@@ -33,6 +33,12 @@ class quiz_description_qtype extends quiz_default_questiontype {
                          $question->questiontextformat,
                          NULL, $cmoptions->course);
         quiz_print_possible_question_image($question, $cmoptions->course);
+        if (isteacher($cmoptions->course)) {
+            echo '<font size="1">';
+            link_to_popup_window ('/mod/quiz/question.php?id=' . $question->id,
+             'editquestion', get_string('edit'), 450, 550, get_string('edit'));
+            echo '</font>';
+        }
         print_simple_box_end('center', '90%');
     }