diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 4a95237c..f24f8f2c 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -35,7 +35,7 @@
         <div class="column is-narrow">
             {% include 'snippets/book_cover.html' with book=book size=large %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
-            {% include 'snippets/shelve_button.html' %}
+            {% include 'snippets/shelve_button/shelve_button.html' %}
 
             {% if request.user.is_authenticated and not book.cover %}
             <div class="box p-2">
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index f0c7b057..00ac4ab8 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -48,7 +48,7 @@
                 </div>
             </div>
             <div class="card-content">
-                {% include 'snippets/shelve_button.html' with book=book %}
+                {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
                 {% active_shelf book as active_shelf %}
                 {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
                 {% include 'snippets/progress_update.html' with readthrough=book.latest_readthrough %}
diff --git a/bookwyrm/templates/snippets/book_preview.html b/bookwyrm/templates/snippets/book_preview.html
index e7eca455..178aa64d 100644
--- a/bookwyrm/templates/snippets/book_preview.html
+++ b/bookwyrm/templates/snippets/book_preview.html
@@ -3,7 +3,7 @@
     <div class="column is-narrow">
         <div>
         <a href="/book/{{ book.id }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-        {% include 'snippets/shelve_button.html' with book=book %}
+        {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
     </div>
     <div class="column">
diff --git a/bookwyrm/templates/snippets/book_tiles.html b/bookwyrm/templates/snippets/book_tiles.html
index 85f685a8..1867a8a8 100644
--- a/bookwyrm/templates/snippets/book_tiles.html
+++ b/bookwyrm/templates/snippets/book_tiles.html
@@ -5,7 +5,7 @@
             <a href="/book/{{ book.id }}">
                 {% include 'snippets/book_cover.html' with book=book %}
             </a>
-            {% include 'snippets/shelve_button.html' with book=book switch_mode=True %}
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
         </div>
     </div>
     {% endfor %}
diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
similarity index 100%
rename from bookwyrm/templates/snippets/shelve_button.html
rename to bookwyrm/templates/snippets/shelve_button/shelve_button.html
diff --git a/bookwyrm/templates/snippets/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
similarity index 100%
rename from bookwyrm/templates/snippets/shelve_button_dropdown.html
rename to bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
diff --git a/bookwyrm/templates/snippets/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
similarity index 100%
rename from bookwyrm/templates/snippets/shelve_button_options.html
rename to bookwyrm/templates/snippets/shelve_button/shelve_button_options.html