diff --git a/fedireads/static/format.css b/fedireads/static/format.css
index 0db8d49f..b57f6f6a 100644
--- a/fedireads/static/format.css
+++ b/fedireads/static/format.css
@@ -754,6 +754,14 @@ button.dropdown-button {
     border: none;
 }
 
+.dropdown-content button[disabled] {
+    color: #aaa;
+}
+
+.dropdown-content button[disabled]:hover {
+    background-color: #eee;
+}
+
 .dropdown-content button:hover {
     background-color: #ddd;
 }
diff --git a/fedireads/templates/snippets/shelve_button.html b/fedireads/templates/snippets/shelve_button.html
index 80d76e9f..db40abc5 100644
--- a/fedireads/templates/snippets/shelve_button.html
+++ b/fedireads/templates/snippets/shelve_button.html
@@ -13,7 +13,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}"></input>
         {% for shelf in request.user.shelf_set.all %}
-            <button class="secondary" name="shelf" type="submit" value="{{ shelf.identifier }}">{{ shelf.name }}</button>
+            <button class="secondary" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>{{ shelf.name }} {% if shelf in book.shelf_set.all %} ✓ {% endif %}</button>
         {% endfor %}
     </form>
 </div>