diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 21d6992bf43..4657025ee4b 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -328,6 +328,30 @@
     echo '</tr>';
 } else $fix=1 ?>
 
+<?php if ($CFG->quiz_fix_delay1) { ?>
+    <tr valign="top">
+        <td align="right"><b><?php print_string("delay1", "quiz") ?>:</b></td>
+        <td align="left">
+        <?php
+             choose_from_menu($timedelayoptions, "delay1", "$form->delay1", "");
+             helpbutton("timedelay1", get_string("delay1","quiz"), "quiz");
+        ?>
+        </td>
+        </tr>
+<?php } ?>
+
+<?php if ($CFG->quiz_fix_delay2) { ?>
+     <tr valign="top">
+         <td align="right"><b><?php print_string("delay2", "quiz") ?>:</b></td>
+         <td align="left">
+         <?php
+             choose_from_menu($timedelayoptions, "delay2", "$form->delay2", "");
+             helpbutton("timedelay2", get_string("delay2","quiz"), "quiz");
+         ?>
+         </td>
+         </tr>
+<?php } ?>
+
 <?php if (!$CFG->quiz_fix_popup) { ?>
     <tr valign="top">
         <td align="right"><b><?php print_string("popup", "quiz") ?>:</b></td>
@@ -340,30 +364,6 @@
     </tr>
 <?php } else $fix=1 ?>
 
-<?php if (!$CFG->quiz_fix_delay1) { ?>
-    <tr valign="top">
-        <td align="right"><b><?php print_string("delay1", "quiz") ?>:</b></td>
-        <td align="left">
-        <?php
-             choose_from_menu($timedelayoptions, "delay1", "$form->delay1", "");
-             helpbutton("timedelay1", get_string("delay1","quiz"), "quiz");
-        ?>
-        </td>
-        </tr>
-<?php } else $fix=1 ?>
-
-<?php if (!$CFG->quiz_fix_delay2) { ?>
-    <tr valign="top">
-        <td align="right"><b><?php print_string("delay2", "quiz") ?>:</b></td>
-        <td align="left">
-        <?php
-             choose_from_menu($timedelayoptions, "delay2", "$form->delay2", "");
-             helpbutton("timedelay2", get_string("delay2","quiz"), "quiz");
-        ?>
-        </td>
-        </tr>
-<?php } else $fix=1 ?>
-
 <?php if (!$CFG->quiz_fix_password) { ?>
     <tr valign="top">
         <td align="right"><b><?php print_string("requirepassword", "quiz") ?>:</b></td>