diff --git a/question/editlib.php b/question/editlib.php
index dd8afaac9f9..87fe774fd8d 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -96,6 +96,13 @@ function question_list($course, $categoryid, $quizid=0,
  $recurse=1, $page=0, $perpage=100, $showhidden=false, $sortorder='qtype, name ASC') {
     global $QTYPE_MENU, $USER, $CFG;
 
+    $qtypemenu = $QTYPE_MENU;
+    if ($rqp_types = get_records('question_rqp_types')) {
+        foreach($rqp_types as $type) {
+            $qtypemenu['rqp_'.$type->id] = $type->name;
+        }
+    }
+
     $strcategory = get_string("category", "quiz");
     $strquestion = get_string("question", "quiz");
     $straddquestions = get_string("addquestions", "quiz");
@@ -143,7 +150,7 @@ function question_list($course, $categoryid, $quizid=0,
     if (isteacheredit($category->course)) {
         echo "<td valign=\"top\"><b>$strcreatenewquestion:</b></td>";
         echo '<td valign="top" align="right">';
-        popup_form ("$CFG->wwwroot/question/question.php?category=$category->id&amp;qtype=", $QTYPE_MENU, "addquestion",
+        popup_form ("$CFG->wwwroot/question/question.php?category=$category->id&amp;qtype=", $qtypemenu, "addquestion",
                     "", "choose", "", "", false, "self");
         echo '</td><td width="10" valign="top" align="right">';
         helpbutton("questiontypes", $strcreatenewquestion, "quiz");
diff --git a/question/type/rqp/questiontype.php b/question/type/rqp/questiontype.php
index d4d71ab27bd..68d45d5564b 100644
--- a/question/type/rqp/questiontype.php
+++ b/question/type/rqp/questiontype.php
@@ -547,13 +547,6 @@ class question_rqp_qtype extends default_questiontype {
 //////////////////////////////////////////////////////////////////////////
 //// INITIATION - Without this line the question type is not in use... ///
 //////////////////////////////////////////////////////////////////////////
-// define("RQP",          "11"); // already defined in questionlib.php
 $QTYPES[RQP]= new question_rqp_qtype();
-// The following adds the questiontype to the menu of types shown to teachers
-if ($rqp_types = get_records('question_rqp_types')) {
-    foreach($rqp_types as $type) {
-        $QTYPE_MENU[100+$type->id] = $type->name;
-    }
-}
 
 ?>