diff --git a/app/javascript/src/javascripts/forum_posts.js b/app/javascript/src/javascripts/forum_posts.js
index 9b8f7ef0c..28437c5df 100644
--- a/app/javascript/src/javascripts/forum_posts.js
+++ b/app/javascript/src/javascripts/forum_posts.js
@@ -7,17 +7,15 @@ ForumPost.initialize_all = function() {
 }
 
 ForumPost.initialize_edit_links = function() {
-  $(".edit_forum_post_link").on("click.danbooru", 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).fadeToggle("fast");
+  $(document).on("click.danbooru", ".edit_forum_post_link", function(e) {
+    let $form = $(this).parents("article.forum-post").find("form.edit_forum_post");
+    $form.fadeToggle("fast");
     e.preventDefault();
   });
 
-  $(".edit_forum_topic_link").on("click.danbooru", 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).fadeToggle("fast");
+  $(document).on("click.danbooru", ".edit_forum_topic_link", function(e) {
+    let $form = $(this).parents("article.forum-post").find("form.edit_forum_topic");
+    $form.fadeToggle("fast");
     e.preventDefault();
   });
 
diff --git a/app/views/forum_posts/partials/edit/_form.html.erb b/app/views/forum_posts/partials/edit/_form.html.erb
index 3a1b641d7..9dfd75b26 100644
--- a/app/views/forum_posts/partials/edit/_form.html.erb
+++ b/app/views/forum_posts/partials/edit/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for("forum_post") %>
 
-<%= edit_form_for(forum_post) do |f| %>
+<%= edit_form_for(forum_post, namespace: "forum_post_#{forum_post.id}") do |f| %>
   <%= f.input :body, as: :dtext %>
 
   <%= f.button :submit, "Submit" %>