diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
index 89cc9a2e..8f041304 100644
--- a/bookwyrm/templates/snippets/reading_modals/layout.html
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -1,4 +1,4 @@
-{% extends 'components/modal.html' %}
+{% extends 'components/new_modal.html' %}
 {% load i18n %}
 {% load utilities %}
 
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index f96f48a8..aacaf5a2 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -86,11 +86,14 @@
 </li>
 {% endif %}
 
-{% include 'snippets/reading_modals/want_to_read_modal.html' with book=active_shelf.book controls_text="want_to_read" controls_uid=uuid move_from=current.id refresh=True class="" %}
+{% join "want_to_read" uuid as modal_id %}
+{% include 'snippets/reading_modals/want_to_read_modal.html' with book=active_shelf.book id=modal_id move_from=current.id refresh=True class="" %}
 
-{% include 'snippets/reading_modals/start_reading_modal.html' with book=active_shelf.book controls_text="start_reading" controls_uid=uuid move_from=current.id refresh=True class="" %}
+{% join "start_reading" uuid as modal_id %}
+{% include 'snippets/reading_modals/start_reading_modal.html' with book=active_shelf.book id=modal_id move_from=current.id refresh=True class="" %}
 
-{% include 'snippets/reading_modals/finish_reading_modal.html' with book=active_shelf.book controls_text="finish_reading" controls_uid=uuid  move_from=current.id readthrough=readthrough refresh=True class="" %}
+{% join "finish_reading" uuid as modal_id %}
+{% include 'snippets/reading_modals/finish_reading_modal.html' with book=active_shelf.book id=modal_id  move_from=current.id readthrough=readthrough refresh=True class="" %}
 
 {% endwith %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index b70ba1b9..f27c1859 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -19,13 +19,17 @@
     {% endif %}
 </div>
 
-{% include 'snippets/reading_modals/want_to_read_modal.html' with book=active_shelf.book controls_text="want_to_read" controls_uid=uuid %}
+{% join "want_to_read" uuid as modal_id %}
+{% include 'snippets/reading_modals/want_to_read_modal.html' with book=active_shelf.book id=modal_id %}
 
-{% include 'snippets/reading_modals/start_reading_modal.html' with book=active_shelf.book controls_text="start_reading" controls_uid=uuid %}
+{% join "start_reading" uuid as modal_id %}
+{% include 'snippets/reading_modals/start_reading_modal.html' with book=active_shelf.book id=modal_id %}
 
-{% include 'snippets/reading_modals/finish_reading_modal.html' with book=active_shelf.book controls_text="finish_reading" controls_uid=uuid readthrough=readthrough %}
+{% join "finish_reading" uuid as modal_id %}
+{% include 'snippets/reading_modals/finish_reading_modal.html' with book=active_shelf.book id=modal_id readthrough=readthrough %}
 
-{% include 'snippets/reading_modals/progress_update_modal.html' with book=active_shelf.book controls_text="progress_update" controls_uid=uuid readthrough=readthrough %}
+{% join "progress_update" uuid as modal_id %}
+{% include 'snippets/reading_modals/progress_update_modal.html' with book=active_shelf.book id=modal_id readthrough=readthrough %}
 
 {% endwith %}
 {% endif %}