diff --git a/course/yui/modchooser/modchooser.js b/course/yui/modchooser/modchooser.js
index 28b90815d9f..f7ff2c67f48 100644
--- a/course/yui/modchooser/modchooser.js
+++ b/course/yui/modchooser/modchooser.js
@@ -152,6 +152,9 @@ YUI.add('moodle-course-modchooser', function(Y) {
     {
         NAME : MODCHOOSERNAME,
         ATTRS : {
+            maxheight : {
+                value : 800
+            }
         }
     });
     M.course = M.course || {};
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 55085306c06..9314951e56a 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -899,7 +899,6 @@ sup {vertical-align: super;}
 
 /* Only set these options if we're showing the js container */
 .jsenabled .choosercontainer #chooseform .alloptions {
-    max-height: 550px;
     overflow-x: hidden;
     overflow-y: auto;
     max-width: 20.3em;
@@ -973,7 +972,6 @@ sup {vertical-align: super;}
     background-color: #FFFFFF;
     overflow-x: hidden;
     overflow-y: auto;
-    max-height: 550px;
     line-height: 2em;
 }