diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 2638a9ff..6b4a3f25 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -3,9 +3,15 @@
 
 {% with 0|uuid as report_uuid %}
 
-{% trans "Report" as button_text %}
-{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal_title_report" disabled=is_current %}
-
-{% include 'snippets/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
+{% join "report" report_uuid as modal_id %}
+<button
+    class="button is-small is-danger is-light is-fullwidth"
+    type="button"
+    data-modal-open="{{ modal_id }}"
+    {% if is_current %}disabled{% endif %}
+>
+    {% trans "Report" %}
+</button>
+{% include 'snippets/report_modal.html' with user=user reporter=request.user id=modal_id %}
 
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index 0d6504ab..615f13cc 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -1,4 +1,4 @@
-{% extends 'components/modal.html' %}
+{% extends 'components/new_modal.html' %}
 {% load i18n %}
 {% load humanize %}
 
@@ -21,8 +21,12 @@
 
 <section class="content">
     <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
-    <label class="label" for="id_{{ controls_uid }}_report_note">{% trans "More info about this report:" %}</label>
-    <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
+    <div class="control">
+        <label class="label" for="id_{{ controls_uid }}_report_note">
+            {% trans "More info about this report:" %}
+        </label>
+        <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
+    </div>
 </section>
 
 {% endblock %}
@@ -31,9 +35,9 @@
 {% block modal-footer %}
 
 <button class="button is-success" type="submit">{% trans "Submit" %}</button>
-{% trans "Cancel" as button_text %}
-{% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="report" controls_uid=report_uuid class="" %}
+<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
 
 {% endblock %}
+
 {% block modal-form-close %}</form>{% endblock %}