diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 586d7d9d1..dc07fb64b 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -3,6 +3,7 @@
 
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
+{% latest_read_through book request.user as readthrough %}
 <div class="field has-addons mb-0">
     {% if switch_mode and active_shelf.book != book %}
     <div class="control">
@@ -20,7 +21,6 @@
 
 {% include 'snippets/shelve_button/start_reading_modal.html' with book=active_shelf.book controls_text="start-reading" controls_uid=uuid %}
 
-{% latest_read_through book request.user as readthrough %}
 {% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %}
 
 {% include 'snippets/shelve_button/progress_update_modal.html' with book=shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 56783b2cc..a002917f4 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -28,6 +28,8 @@
 {% if dropdown %}</li>{% endif %}
 {% endfor %}
 {% if dropdown %}
+
+{% if readthrough and active_shelf.shelf.identifier != 'read' %}
 <li role="menuitem">
     <div class="dropdown-item pt-0 pb-0">
         {% trans "Update progress" as button_text %}
@@ -35,3 +37,18 @@
     </div>
 </li>
 {% endif %}
+
+{% if active_shelf.shelf %}
+<li role="menuitem">
+    <div class="dropdown-item pt-0 pb-0">
+        <form  name="shelve" action="/unshelve/" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+        </form>
+    </div>
+</li>
+{% endif %}
+
+{% endif %}