diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb
index 1985cc02d..db4ac4be1 100644
--- a/app/javascript/src/javascripts/posts.js.erb
+++ b/app/javascript/src/javascripts/posts.js.erb
@@ -104,7 +104,6 @@ Post.open_edit_dialog = function() {
   $("#post-edit-link").parent("li").addClass("active");
 
   var $tag_string = $("#post_tag_string,#upload_tag_string");
-  $("div.input").has($tag_string).prevAll().hide();
   $("#open-edit-dialog").hide();
 
   var dialog = $("<div/>").attr("id", "edit-dialog");
diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss
index 42f36505e..d4eeadc9f 100644
--- a/app/javascript/src/styles/specific/posts.scss
+++ b/app/javascript/src/styles/specific/posts.scss
@@ -80,8 +80,13 @@ table article.post-preview {
   margin-top: 1em;
 }
 
-#edit-dialog textarea {
-  margin-bottom: 0.25em;
+#edit-dialog {
+  /* Hide everything but the rating and tags fields. */
+  .post_has_embedded_notes_fieldset, .post_lock_fieldset, .post_parent_id,
+  .post_source, #filedropzone, .upload_as_pending, .upload_source_container,
+  .upload_parent_id, .upload_artist_commentary_container {
+    display: none;
+  }
 }
 
 .post-preview {
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index 6867b657f..cfd472f04 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -21,13 +21,13 @@
     <%= f.input :rating, collection: [["Explicit", "e"], ["Questionable", "q"], ["Safe", "s"]], as: :radio_buttons, boolean_style: :inline %>
   <% end %>
 
-  <fieldset class="inline-fieldset">
+  <fieldset class="inline-fieldset post_has_embedded_notes_fieldset">
     <label>Notes</label>
     <%= f.input :has_embedded_notes, label: "Embed notes", as: :boolean, boolean_style: :inline, disabled: post.is_note_locked? %>
   </fieldset>
 
   <% if policy(post).can_lock_rating? || policy(post).can_lock_notes? || policy(post).can_lock_status? %>
-    <fieldset class="inline-fieldset">
+    <fieldset class="inline-fieldset post_lock_fieldset">
       <label>Lock</label>
 
       <% if policy(post).can_lock_rating? %>