diff --git a/question/editlib.php b/question/editlib.php
index 3419f00ea12..e1050432c06 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -74,7 +74,7 @@ function question_category_form($course, $current, $recurse=1, $showhidden=false
     echo "<table width=\"100%\"><tr><td width=\"20\" nowrap=\"nowrap\">";
     echo "<b>$strcategory:</b>&nbsp;";
     echo "</td><td>";
-    popup_form ("edit.php?cat=", $catmenu, "catmenu", $current, "", "", "", false, "self");
+    popup_form ("edit.php?courseid=$course->id&amp;cat=", $catmenu, "catmenu", $current, "", "", "", false, "self");
     echo "</td><td align=\"right\">";
     echo "<form method=\"get\" action=\"$CFG->wwwroot/question/category.php\">";
     echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";