diff --git a/question/editlib.php b/question/editlib.php
index d03f8175d2f..a69cda3b1ff 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -803,7 +803,7 @@ class question_bank_view {
 
         // Create the url of the new question page to forward to.
         $this->editquestionurl = new moodle_url("$CFG->wwwroot/question/question.php",
-                array('returnurl' => $pageurl->out()));
+                array('returnurl' => urlencode($pageurl->out(false, array(), false))));
         if ($cm !== null){
             $this->editquestionurl->param('cmid', $cm->id);
         } else {