diff --git a/bookwyrm/templates/lists/bookmark_button.html b/bookwyrm/templates/lists/bookmark_button.html
new file mode 100644
index 00000000..8831d398
--- /dev/null
+++ b/bookwyrm/templates/lists/bookmark_button.html
@@ -0,0 +1,39 @@
+{% load i18n %}
+{% load interaction %}
+
+{% if request.user.is_authenticated %}
+
+{% with request.user|bookmarked:list as bookmarked %}
+<form
+    name="bookmark-{{ list.id }}"
+    action="/"
+    method="POST"
+    class="interaction bookmark_{{ list.id }} {% if bookmarked %}is-hidden{% endif %}"
+    data-id="bookmark_{{ list.id }}"
+>
+    {% csrf_token %}
+    {% trans "Bookmark" as text %}
+    <button class="button">
+        <span class="icon icon-bookmark m-0-mobile" title="{{ text }}"></span>
+        <span class="is-sr-only-mobile">{{ text }}</span>
+    </button>
+</form>
+
+<form
+    name="bookmark-{{ list.id }}"
+    action="/"
+    method="POST"
+    class="interaction active bookmark_{{ list.id }} {% if not bookmarked %}is-hidden{% endif %}"
+    data-id="bookmark_{{ list.id }}"
+>
+    {% csrf_token %}
+    {% trans "Un-bookmark" as text %}
+    <button class="button">
+        <span class="icon icon-bookmark m-0-mobile has-text-primary" title="{{ text }}"></span>
+        <span class="is-sr-only-mobile">{{ text }}</span>
+    </button>
+</form>
+{% endwith %}
+
+{% endif %}
+
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index b24ce9e3..68abafc0 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -11,12 +11,13 @@
             {% include 'lists/created_text.html' with list=list %}
         </p>
     </div>
-    {% if request.user == list.user %}
-    <div class="column is-narrow">
-        {% trans "Edit List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}
+    <div class="column is-narrow is-flex">
+        {% if request.user == list.user %}
+            {% trans "Edit List" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}
+        {% endif %}
+        {% include "lists/bookmark_button.html" with list=list %}
     </div>
-    {% endif %}
 </header>
 
 <div class="block content">
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 0670b4c5..bf181b1f 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -4,15 +4,27 @@
 
 {% with status.id|uuid as uuid %}
 {% with request.user|liked:status as liked %}
-<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
+<form
+    name="favorite"
+    action="/favorite/{{ status.id }}"
+    method="POST"
+    class="interaction fav_{{ status.id }}_{{ uuid }} {% if liked %}is-hidden{% endif %}"
+    data-id="fav_{{ status.id }}_{{ uuid }}"
+>
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
-        <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}">
-        </span>
+        <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}"></span>
         <span class="is-sr-only-mobile">{% trans "Like" %}</span>
     </button>
 </form>
-<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}" data-id="fav_{{ status.id }}_{{ uuid }}">
+
+<form
+    name="unfavorite"
+    action="/unfavorite/{{ status.id }}"
+    method="POST"
+    class="interaction fav_{{ status.id }}_{{ uuid }} active {% if not liked %}is-hidden{% endif %}"
+    data-id="fav_{{ status.id }}_{{ uuid }}"
+>
     {% csrf_token %}
     <button class="button is-light is-transparent is-small" type="submit">
         <span class="icon icon-heart has-text-primary m-0-mobile" title="{% trans 'Un-like' %}"></span>
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
index bbe74600..8ef8e358 100644
--- a/bookwyrm/templatetags/interaction.py
+++ b/bookwyrm/templatetags/interaction.py
@@ -16,3 +16,8 @@ def get_user_liked(user, status):
 def get_user_boosted(user, status):
     """did the given user fav a status?"""
     return status.boosters.filter(user=user).exists()
+
+@register.filter(name="bookmarked")
+def get_user_bookmarked(user, book_list):
+    """did the user bookmark a list"""
+    return user.saved_lists.filter(id=book_list.id).exists()