diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php
index 299b90a6fc6..86eafdd96ba 100644
--- a/mod/quiz/classes/output/edit_renderer.php
+++ b/mod/quiz/classes/output/edit_renderer.php
@@ -435,6 +435,9 @@ class edit_renderer extends \plugin_renderer_base {
         $menu->set_constraint('.mod-quiz-edit-content');
         $trigger = html_writer::tag('span', get_string('add', 'quiz'), array('class' => 'add-menu'));
         $menu->set_menu_trigger($trigger);
+        // The menu appears within an absolutely positioned element causing width problems.
+        // Make sure no-wrap is set so that we don't get a squashed menu.
+        $menu->set_nowrap_on_items(true);
 
         // Disable the link if quiz has attempts.
         if (!$structure->can_be_edited()) {
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index f63dbad2f33..a2e7b50c105 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -556,10 +556,6 @@ table.quizreviewsummary td.cell {
     left: 0;
 }
 
-#page-mod-quiz-edit .mod-quiz-edit-content .moodle-actionmenu[data-enhanced].show .menu a {
-    white-space: nowrap;
-}
-
 #page-mod-quiz-edit .slotnumber {
     background-color: #D3D3D3;
     text-align: center;