diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
new file mode 100644
index 00000000..6a244ffd
--- /dev/null
+++ b/bookwyrm/templates/components/inline_form.html
@@ -0,0 +1,13 @@
+<section class="card hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
+    <header class="card-header has-background-white-ter">
+        <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}-header">
+            {% block header %}{% endblock %}
+        </h2>
+        <span class="card-header-icon">
+        {% include 'snippets/toggle/toggle_button.html' with label="Close" class="delete" nonbutton=True controls_text=controls_text %}
+        </span>
+    </header>
+    <section class="card-content content">
+        {% block form %}{% endblock %}
+    </section>
+</section>
diff --git a/bookwyrm/templates/lists/create_form.html b/bookwyrm/templates/lists/create_form.html
new file mode 100644
index 00000000..706dff08
--- /dev/null
+++ b/bookwyrm/templates/lists/create_form.html
@@ -0,0 +1,11 @@
+{% extends 'components/inline_form.html' %}
+
+{% block header %}
+Create List
+{% endblock %}
+
+{% block form %}
+    <form name="create-list" method="post" action="{% url 'lists' %}">
+    {% include 'lists/form.html' %}
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/lists/edit_form.html b/bookwyrm/templates/lists/edit_form.html
new file mode 100644
index 00000000..55723b72
--- /dev/null
+++ b/bookwyrm/templates/lists/edit_form.html
@@ -0,0 +1,11 @@
+{% extends 'components/inline_form.html' %}
+
+{% block header %}
+Edit List
+{% endblock %}
+
+{% block form %}
+<form name="edit-list" method="post" action="{% url 'list' list.id %}">
+    {% include 'lists/form.html' %}
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 1887cd82..d3ff2c48 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -15,15 +15,9 @@
     {% 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" 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>
-    </header>
-    {% include 'lists/form.html' %}
-</form>
+<div class="block">
+    {% include 'lists/edit_form.html' with controls_text="edit-list" %}
+</div>
 
 {% block panel %}{% endblock %}
 
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index a0e18933..ad2dfbaf 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -5,26 +5,20 @@
     <h1 class="title">Lists</h1>
 </header>
 {% if request.user.is_authenticated and not lists.has_previous %}
-<section class="block content">
-    <header class="columns">
-        <div class="column">
-            <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" focus="create-list-header" %}
-        </div>
-    </header>
+<header class="block columns">
+    <div class="column">
+        <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" 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" 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 %}
-            </div>
-        </header>
-        {% include 'lists/form.html' %}
-    </form>
+<div class="block">
+    {% include 'lists/create_form.html' with controls_text="create-list" %}
+</div>
 
+<div class="block content">
     {% if request.user.list_set.exists %}
     {% include 'lists/list_items.html' with lists=request.user.list_set.all|slice:4 %}
     {% endif %}