diff --git a/question/question.php b/question/question.php
index e96da88b894..caac68a7253 100644
--- a/question/question.php
+++ b/question/question.php
@@ -59,9 +59,11 @@ if ($inpopup !== 0) {
 }
 $PAGE->set_url($url);
 
-if ($originalreturnurl) {
+if ($originalreturnurl && $wizardnow == '') {
     $returnurl = $CFG->wwwroot . '/' . $originalreturnurl;
-} else {
+} else if ($originalreturnurl && $wizardnow !== ''){
+    $returnurl = $originalreturnurl;
+}else {
     $returnurl = "{$CFG->wwwroot}/question/edit.php?courseid={$COURSE->id}";
 }