diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index cb9678d4839c7a7c47c7970ead407a536e3a7173..0e7e0a4de13b231867165288cdc9148bc2510658 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -67,10 +67,6 @@ $ ->
     $('.appear-data').fadeIn()
     e.preventDefault()
 
-  $('body').keydown (e) ->
-    if e.which is 191
-      new Shortcuts()
-
   # Initialize chosen selects
   $('select.chosen').chosen()
 
@@ -114,6 +110,10 @@ $ ->
       when 115
         $("#search").focus()
         e.preventDefault()
+      when 63
+        new Shortcuts()
+        e.preventDefault()
+
 
   # Commit show suppressed diff
   $(".supp_diff_link").bind "click", ->
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 7cbe5fc45ff7008a2e1532589fcc7a1b1a7ed9ba..793cb450c98225ea8f0a186f06eaf13eee527ceb 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -1,6 +1,6 @@
 #modal-shortcuts.modal.hide
   .modal-header
-    %a.close{href: "#"} ×
+    %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3 Keyboard Shortcuts
   .modal-body
     %h5 Global Shortcuts