diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index 3a222cf6..cc600972 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 {% load utilities %}
 
-{% block title %}{% trans "Compose status" %}{% endblock %}
+{% block title %}{% trans "Edit status" %}{% endblock %}
 {% block content %}
 <header class="block content">
-    <h1>{% trans "Compose status" %}</h1>
+    <h1>{% trans "Edit status" %}</h1>
 </header>
 
 {% with 0|uuid as uuid %}
diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html
index 82ccdbe7..10cdf639 100644
--- a/bookwyrm/templates/snippets/create_status/comment.html
+++ b/bookwyrm/templates/snippets/create_status/comment.html
@@ -15,6 +15,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
 {% trans "Some thoughts on the book" as placeholder %}
 
 {% block post_content_additions %}
+    {% if not draft.reading_status %}
     {# Supplemental fields #}
     <div>
         {% active_shelf book as active_shelf %}
@@ -68,6 +69,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
         {% endwith %}
         {% endif %}
     </div>
+    {% endif %}
 {% endblock %}
 
 {% endwith %}