diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index add82a7d..d35881f1 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -26,7 +26,9 @@
 
             <input class="toggle-control" type="radio" name="more-results" id="fewer-results" checked>
             <div class="toggle-content hidden">
-                <label class="button is-small" for="more-results">Show results from other catalogues</label>
+                <label class="button is-small" for="more-results">
+                    <div role="button" tabindex="0">Show results from other catalogues</div>
+                </label>
             </div>
         </div>
         {% endif %}
@@ -58,7 +60,9 @@
             {% endif %}
             {% endfor %}
             {% if local_results.results %}
-            <label class="button is-small" for="fewer-results">Hide results from other catalogues</label>
+            <label class="button is-small" for="fewer-results">
+                <div role="button" tabindex="0">Hide results from other catalogues</div>
+            </label>
             {% endif %}
         </div>
     </div>
diff --git a/bookwyrm/templates/snippets/status_body.html b/bookwyrm/templates/snippets/status_body.html
index 9016669f..1c1d41de 100644
--- a/bookwyrm/templates/snippets/status_body.html
+++ b/bookwyrm/templates/snippets/status_body.html
@@ -33,7 +33,11 @@
                 {% if request.user.is_authenticated %}
 
                 <label class="button is-small" for="show-comment-{{ status.id }}">
-                    <span class="icon icon-comment"><span class="is-sr-only">Comment</span></span>
+                    <div role="button" tabindex="0">
+                        <span class="icon icon-comment">
+                            <span class="is-sr-only">Comment</span>
+                        </span>
+                    </div>
                 </label>
                 {% include 'snippets/boost_button.html' with status=status %}
                 {% include 'snippets/fav_button.html' with status=status %}