diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 554bd8666d..3d945f4627 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -608,14 +608,18 @@ function update_autocomplete() {
     instance_list.sort();
     people_list.sort();
 
+    // limit number of items so the list doesn't fall off the screen
     $( "#class" ).typeahead({
-        source: class_list
+        source: class_list,
+        items: 3,
     });
     $( "#instance" ).typeahead({
-        source: instance_list
+        source: instance_list,
+        items: 2,
     });
     $( "#recipient" ).typeahead({
-        source: people_list
+        source: people_list,
+        items: 4,
     });
 }