diff --git a/bookwyrm/templates/snippets/components/modal.html b/bookwyrm/templates/snippets/components/modal.html
index 63db11681..3eec9efae 100644
--- a/bookwyrm/templates/snippets/components/modal.html
+++ b/bookwyrm/templates/snippets/components/modal.html
@@ -1,7 +1,7 @@
 <div class="modal hidden" id="{{ controls_text }}-{{ controls_uid }}">
     <div class="modal-background"></div>
     <div class="modal-card">
-        <header class="modal-card-head">
+        <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
             <h2 class="modal-card-title">
                 {% block modal-title %}{% endblock %}
             </h2>
diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button.html
index 96382d966..0dfabe04f 100644
--- a/bookwyrm/templates/snippets/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button.html
@@ -14,9 +14,9 @@
             <span>Read</span> <span class="icon icon-check"></span>
         </button>
         {% elif active_shelf.shelf.identifier == 'reading' %}
-        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="I'm done!" controls_text="finish-reading" controls_uid=uuid %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="I'm done!" controls_text="finish-reading" controls_uid=uuid focus="modal-title-finish-reading" %}
         {% elif active_shelf.shelf.identifier == 'to-read' %}
-        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Start reading" controls_text="start-reading" controls_uid=uuid %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Start reading" controls_text="start-reading" controls_uid=uuid focus="modal-title-start-reading" %}
         {% else %}
         <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button_dropdown.html
index 212770f18..80c76d41f 100644
--- a/bookwyrm/templates/snippets/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button_dropdown.html
@@ -10,7 +10,7 @@
 <li role="menuitem">
     {% if active_shelf.shelf.identifier != 'reading' and shelf.identifier == 'reading' %}
     <div class="dropdown-item pt-0 pb-0">
-        {% include 'snippets/toggle/toggle_button.html' with class="is-fullwidth is-small" text="Start reading" controls_text="start-reading" controls_uid=button_uuid %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-fullwidth is-small" text="Start reading" controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" %}
     </div>
     {% else %}
     <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">