diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 1dbbe9b99..9bb47317c 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -9,6 +9,12 @@
     this.initialize_post_image_resize_links();
     this.initialize_image_resize();
     this.initialize_titles();
+    
+    $("#side-edit-link").click(function(e) {
+      $("#post-edit-link").trigger("click");
+      $("#post_tag_string").trigger("focus");
+      e.preventDefault();
+    });
   }
   
   Danbooru.Post.initialize_titles = function() {
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index c6f246d1c..c6a4690b7 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -1,5 +1,6 @@
 <ul>
   <%= resize_image_links(post, CurrentUser.user) %>
+  <li><%= link_to "Edit", post_path(post), :id => "side-edit-link" %></li>
   <% if CurrentUser.is_member? %>
     <li><%= link_to "Favorite", favorites_path(:post_id => post.id), :remote => true, :method => :post, :id => "add-to-favorites" %></li>
     <li><%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %></li>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index f4c3f5414..f5375b5ef 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -45,7 +45,7 @@
       
       <menu id="post-sections">
         <li><a href="#comments">Comments</a></li>
-        <li><a href="#edit">Edit</a></li>
+        <li><a href="#edit" id="post-edit-link">Edit</a></li>
         <li><a href="#notes">Notes</a></li>
       </menu>