diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 5e8d2c12..1887cd82 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -10,14 +10,14 @@
     </div>
     {% if request.user == list.user %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" %}
+        {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
     </div>
     {% endif %}
 </header>
 
 <form name="edit-list" method="post" action="{% url 'list' list.id %}" class="box hidden" id="edit-list">
     <header class="columns">
-        <h3 class="title column">Edit list</h3>
+        <h3 class="title column" tabindex="0" id="edit-list-header">Edit list</h3>
         <div class="column is-narrow">
             {% include 'snippets/toggle/toggle_button.html' with controls_text="edit-list" label="close" class="delete" nonbutton=True %}
         </div>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 0e25bb23..a0e18933 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -11,15 +11,15 @@
             <h2 class="title">Your lists</h2>
         </div>
         <div class="column is-narrow">
-            {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" %}
+            {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" focus="create-list-header" %}
         </div>
     </header>
 
     <form name="create-list" method="post" action="{% url 'lists' %}" class="box hidden" id="create-list">
         <header class="columns">
-            <h3 class="title column">Create list</h3>
+            <h3 class="title column" tabindex="0" id="create-list-header">Create list</h3>
             <div class="column is-narrow">
-                {% include 'snippets/toggle/toggle_button.html' with controls_text="create-list" label="close" class="delete" nonbutton=True %}
+                {% include 'snippets/toggle/toggle_button.html' with controls_text="create-list" label="Close" class="delete" nonbutton=True %}
             </div>
         </header>
         {% include 'lists/form.html' %}