diff --git a/question/editlib.php b/question/editlib.php
index cf429b9abd8..82cbfdd0832 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -323,7 +323,7 @@ function question_list($course, $categoryid, $quizid=0,
         echo "&nbsp;<input title=\"$strselect\" type=\"checkbox\" name=\"q$question->id\" value=\"1\" />";
         echo "</td>\n";
 
-        echo "<td $nameclass>" . $question->name . "</td>\n";
+        echo "<td $nameclass>" . format_string($question->name) . "</td>\n";
         echo "<td $nameclass style='text-align: right'>\n";
         print_question_icon($question, $canedit);
         echo "</td>\n";
diff --git a/question/preview.php b/question/preview.php
index c14e30e579d..b5389efd178 100644
--- a/question/preview.php
+++ b/question/preview.php
@@ -178,7 +178,7 @@
          ->get_correct_responses($questions[$id], $curstate);
     }
 
-    $strpreview = get_string('preview', 'quiz').' '.s($questions[$id]->name);
+    $strpreview = get_string('preview', 'quiz').' '.format_string($questions[$id]->name);
     print_header($strpreview);
     print_heading($strpreview);