diff --git a/app/assets/javascripts/wiki_pages.js b/app/assets/javascripts/wiki_pages.js
index 3e192ed5b..3042d752b 100644
--- a/app/assets/javascripts/wiki_pages.js
+++ b/app/assets/javascripts/wiki_pages.js
@@ -6,6 +6,10 @@
       if (Danbooru.meta("enable-auto-complete") === "true") {
         this.initialize_autocomplete();
       }
+
+      if (Danbooru.meta("enable-js-navigation") === "true") {
+        this.initialize_shortcuts();
+      }
     }
   }
 
@@ -44,6 +48,15 @@
       $(field).data("uiAutocomplete")._renderItem = render_wiki_page;
     });
   }
+
+  Danbooru.WikiPage.initialize_shortcuts = function() {
+    if ($("#a-show").length) {
+      $(document).bind("keypress", "e", function(e) {
+        $("#wiki-page-edit-link")[0].click();
+        e.preventDefault();
+      });
+    }
+  }
 })();
 
 $(document).ready(function() {
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 071d5f611..29680cb34 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -16,7 +16,7 @@
       <% unless @wiki_page.new_record? %>
         <li><%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %></li>
         <% if CurrentUser.is_member? %>
-          <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page) %></li>
+          <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page), :id => "wiki-page-edit-link" %></li>
         <% end %>
         <% if CurrentUser.is_janitor? %>
           <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :data => {:confirm => "Are you sure you want to delete this wiki page?"} %></li>