diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/paginator.js
index e78d86296..373f3db1d 100644
--- a/app/assets/javascripts/paginator.js
+++ b/app/assets/javascripts/paginator.js
@@ -14,7 +14,8 @@
   }
 })();
 
-$(document).ready(function() {
+$(function() {
   key('right', function(){ Danbooru.Paginator.next_page() });
   key('left', function(){ Danbooru.Paginator.prev_page() });
-})
+});
+
diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index e03fca335..0e95fc8a9 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -6,6 +6,10 @@
   Danbooru.Post.initialize_all = function() {
     this.initialize_titles();
     
+    if ($("#c-posts").length) {
+      this.initialize_shortcuts();
+    }
+    
     if ($("#c-posts").length && $("#a-index").length) {
       this.initialize_wiki_page_excerpt();
     }
@@ -19,6 +23,21 @@
     }
   }
   
+  Danbooru.Post.initialize_shortcuts = function() {
+    key('/', function(e) {
+      $("#tags").trigger("focus"); 
+      e.preventDefault();
+    });
+    
+    if ($("#a-show").length) {
+      key('e', function(e) {
+        $("#post-edit-link").trigger("click");
+        $("#post_tag_string").trigger("focus");
+        e.preventDefault();
+      });
+    }
+  }
+  
   Danbooru.Post.initialize_links = function() {
     $("#side-edit-link").click(function(e) {
       $("#post-edit-link").trigger("click");
diff --git a/app/assets/stylesheets/specific/keyboard_shortcuts.css.scss b/app/assets/stylesheets/specific/keyboard_shortcuts.css.scss
index ca766f402..7bd2d6e48 100644
--- a/app/assets/stylesheets/specific/keyboard_shortcuts.css.scss
+++ b/app/assets/stylesheets/specific/keyboard_shortcuts.css.scss
@@ -5,8 +5,9 @@ div#c-static {
     overflow: visible;
     
     section {
-      width: 33%;
+      width: 20%;
       float: left;
+      margin-bottom: 1em;
       
       h1 {
         font-size: $h3_size;
diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb
index 04b384ece..e77d58a85 100644
--- a/app/views/static/keyboard_shortcuts.html.erb
+++ b/app/views/static/keyboard_shortcuts.html.erb
@@ -15,6 +15,7 @@
       <h1>Post</h1>
       <ul>
         <li><span class="key">n</span> New note</li>
+        <li><span class="key">e</span> Edit tags</li>
         <li><span class="key">/</span> Search</li>
       </ul>
     </section>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index f76c78989..80b1686b9 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -19,6 +19,7 @@
       </ul>
       <ul>
         <li><h1>Tools</h1></li>
+        <li><%= link_to("Keyboard Shortcuts", keyboard_shortcuts_path) %></li>
         <li><%= link_to("Bookmarklet", bookmarklet_path) %></li>
         <li><%= link_to("API Documentation", wiki_pages_path(:title => "help:api")) %></li>
       </ul>