diff --git a/app/assets/javascripts/forum_posts.js b/app/assets/javascripts/forum_posts.js
new file mode 100644
index 000000000..2b367818c
--- /dev/null
+++ b/app/assets/javascripts/forum_posts.js
@@ -0,0 +1,31 @@
+(function() {
+  Danbooru.ForumPost = {};
+
+  Danbooru.ForumPost.initialize_all = function() {
+    if ($("#c-forum-topics").length && $("#a-show").length) {;
+      this.initialize_edit_links();
+    }
+  }
+
+  Danbooru.ForumPost.initialize_edit_links = function() {
+    $(".edit_forum_post, .edit_forum_topic").hide();
+
+    $(".edit_forum_post_link").click(function(e) {
+      var link_id = $(this).attr("id");
+      var forum_post_id = link_id.match(/^edit_forum_post_link_(\d+)$/)[1];
+      $("#edit_forum_post_" + forum_post_id).toggle();
+      e.preventDefault();
+    });
+
+    $(".edit_forum_topic_link").click(function(e) {
+      var link_id = $(this).attr("id");
+      var forum_topic_id = link_id.match(/^edit_forum_topic_link_(\d+)$/)[1];
+      $("#edit_forum_topic_" + forum_topic_id).toggle();
+      e.preventDefault();
+    });
+  }
+})();
+
+$(document).ready(function() {
+  Danbooru.ForumPost.initialize_all();
+});
diff --git a/app/views/forum_posts/_form.html.erb b/app/views/forum_posts/_form.html.erb
index dcede6314..a42f0e8fd 100644
--- a/app/views/forum_posts/_form.html.erb
+++ b/app/views/forum_posts/_form.html.erb
@@ -2,8 +2,8 @@
 
 <%= simple_form_for(forum_post) do |f| %>
   <%= f.input :topic_id, :as => :hidden %>
-  <%= dtext_field "forum_post", "body" %>
+  <%= dtext_field "forum_post", "body", :value => forum_post.body, :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
 
   <%= f.button :submit, "Submit" %>
-  <%= dtext_preview_button "forum_post", "body" %>
+  <%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
 <% end %>
diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 5aa59276d..0a4726fba 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -32,9 +32,9 @@
         <% end %>
         <% if forum_post.editable_by?(CurrentUser.user) %>
           <% if forum_post.is_original_post? %>
-            <li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic) %></li>
+            <li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic), :id => "edit_forum_topic_link_#{forum_post.topic.id}", :class => "edit_forum_topic_link" %></li>
           <% else %>
-            <li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
+            <li><%= link_to "Edit", edit_forum_post_path(forum_post.id), :id => "edit_forum_post_link_#{forum_post.id}", :class => "edit_forum_post_link" %></li>
           <% end %>
         <% end %>
         <% if params[:controller] == "forum_posts" %>
@@ -42,6 +42,13 @@
         <% else %>
           <li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
         <% end %>
+        <% if forum_post.editable_by?(CurrentUser.user) %>
+          <% if forum_post.is_original_post? %>
+            <%= render "forum_topics/form", :forum_topic => forum_post.topic %>
+          <% else %>
+            <%= render "forum_posts/form", :forum_post => forum_post %>
+          <% end %>
+        <% end %>
       </menu>
     </div>
     <div class="clearfix"></div>
diff --git a/app/views/forum_topics/_form.html.erb b/app/views/forum_topics/_form.html.erb
index cf05d22c0..df4aa267b 100644
--- a/app/views/forum_topics/_form.html.erb
+++ b/app/views/forum_topics/_form.html.erb
@@ -1,13 +1,13 @@
 <div id="form-content">
-  <%= simple_form_for(@forum_topic) do |f| %>
+  <%= simple_form_for(forum_topic) do |f| %>
     <%= f.input :title %>
 
     <%= f.simple_fields_for :original_post do |pf| %>
-      <% if !@forum_topic.new_record? %>
-        <%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", @forum_topic.id %>
+      <% if !forum_topic.new_record? %>
+        <%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", forum_topic.id %>
       <% end %>
 
-      <%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => @forum_topic.original_post.body %>
+      <%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
     <% end %>
 
     <% if CurrentUser.is_janitor? %>
@@ -16,6 +16,6 @@
     <% end %>
 
     <%= f.button :submit, "Submit" %>
-    <%= dtext_preview_button "forum_post", "body" %>
+    <%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
   <% end %>
 </div>
diff --git a/app/views/forum_topics/edit.html.erb b/app/views/forum_topics/edit.html.erb
index 0436006c3..cbb67c4a1 100644
--- a/app/views/forum_topics/edit.html.erb
+++ b/app/views/forum_topics/edit.html.erb
@@ -2,7 +2,7 @@
   <div id="a-edit">
     <h1>Edit Forum Topic</h1>
 
-    <%= render "form" %>
+    <%= render "form", :forum_topic => @forum_topic %>
   </div>
 </div>