diff --git a/app/assets/javascripts/discourse/controllers/keyboard_shortcuts_help_controller.js b/app/assets/javascripts/discourse/controllers/keyboard_shortcuts_help_controller.js
index c3c15b0924a..6eaec3359cd 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard_shortcuts_help_controller.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard_shortcuts_help_controller.js
@@ -8,5 +8,10 @@
   @module Discourse
 **/
 Discourse.KeyboardShortcutsHelpController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
-  needs: ['modal']
+  needs: ['modal'],
+
+  onShow: function() {
+    this.set('controllers.modal.modalClass', 'keyboard-shortcuts-modal');
+  }
+
 });
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
index 7a49b080727..6d26c8aa829 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
@@ -13,6 +13,10 @@
   background-color: inherit;
 }
 
+.keyboard-shortcuts-modal .modal-body {
+  max-height: 500px;
+}
+
 #keyboard-shortcuts-help {
   ul {
     list-style: none;