diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 27a0cdb6b..089a43451 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -76,25 +76,7 @@
     }
   }
 
-  Danbooru.Post.nav_scroll_down = function() {
-    var scroll_top = $(window).scrollTop() + ($(window).height() * 0.85);
-    Danbooru.scroll_to(scroll_top);
-  }
-
-  Danbooru.Post.nav_scroll_up = function() {
-    var scroll_top = $(window).scrollTop() - ($(window).height() * 0.85);
-    if (scroll_top < 0) {
-      scroll_top = 0;
-    }
-    Danbooru.scroll_to(scroll_top);
-  }
-
   Danbooru.Post.initialize_shortcuts = function() {
-    $(document).bind("keydown.q", function(e) {
-      $("#tags").trigger("focus").selectEnd();
-      e.preventDefault();
-    });
-
     if ($("#a-show").length) {
       $(document).bind("keydown.e", function(e) {
         $("#post-edit-link").trigger("click");
@@ -113,18 +95,10 @@
       });
 
       $(document).bind("keydown.f", function(e) {
-        $("#add-to-favorites").filter(":visible").trigger("click");
+        $("#add-to-favorites:visible").trigger("click");
         e.preventDefault();
       });
     }
-
-    $(document).bind("keydown.s", function(e) {
-      Danbooru.Post.nav_scroll_down();
-    })
-
-    $(document).bind("keydown.w", function(e) {
-      Danbooru.Post.nav_scroll_up();
-    })
   }
 
   Danbooru.Post.initialize_links = function() {
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
new file mode 100644
index 000000000..3fb7abbae
--- /dev/null
+++ b/app/assets/javascripts/shortcuts.js
@@ -0,0 +1,36 @@
+(function() {
+  Danbooru.Shortcuts = {};
+
+  Danbooru.Shortcuts.initialize = function() {
+    $(document).bind("keydown.s", function(e) {
+      Danbooru.Shortcuts.nav_scroll_down();
+    })
+
+    $(document).bind("keydown.w", function(e) {
+      Danbooru.Shortcuts.nav_scroll_up();
+    })
+
+    $(document).bind("keydown.q", function(e) {
+      $("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd();
+      e.preventDefault();
+    });
+  }
+
+  Danbooru.Shortcuts.nav_scroll_down = function() {
+    var scroll_top = $(window).scrollTop() + ($(window).height() * 0.85);
+    Danbooru.scroll_to(scroll_top);
+  }
+
+  Danbooru.Shortcuts.nav_scroll_up = function() {
+    var scroll_top = $(window).scrollTop() - ($(window).height() * 0.85);
+    if (scroll_top < 0) {
+      scroll_top = 0;
+    }
+    Danbooru.scroll_to(scroll_top);
+  }
+})();
+
+
+$(document).ready(function() {
+  Danbooru.Shortcuts.initialize();
+});
diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb
index cad92851d..35327c174 100644
--- a/app/views/static/keyboard_shortcuts.html.erb
+++ b/app/views/static/keyboard_shortcuts.html.erb
@@ -8,6 +8,8 @@
         <li><span class="key">a</span> Previous page</li>
         <li><span class="key">d</span> Next page</li>
         <li><span class="key">q</span> Search</li>
+        <li><span class="key">w</span> Scroll up</li>
+        <li><span class="key">s</span> Scroll down</li>
       </ul>
     </section>