diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html
index 254d17b99..322b69f99 100644
--- a/bookwyrm/templates/lists/add_item_modal.html
+++ b/bookwyrm/templates/lists/add_item_modal.html
@@ -4,7 +4,7 @@
 {% load group_tags %}
 
 {% block modal-title %}
-{% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
+{% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
     {% blocktrans trimmed with title=book|book_title %}
         Add "<em>{{ title }}</em>" to this list
     {% endblocktrans %}
@@ -19,7 +19,7 @@
 <form
     name="add-book-{{ book.id }}"
     method="POST"
-    {% if is_suggestion %}
+    {% if list.suggests_for %}
         action="{% url 'book-add-suggestion' book_id=list.suggests_for.id %}{% if query %}?suggestion_query={{ query }}#suggestions-section{% endif %}"
     {% else %}
         action="{% url 'list-add-book' %}{% if query %}?q={{ query }}{% endif %}"
@@ -39,7 +39,7 @@
 <div class="buttons is-right is-flex-grow-1">
     <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
     <button type="submit" class="button is-link">
-        {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
+        {% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
             {% trans "Add" %}
         {% else %}
             {% trans "Suggest" %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 63f7ffcb2..08a010910 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -161,14 +161,13 @@
     {% endif %}
     {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
         <h2 class="title is-5 mt-6">
-            {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
+            {% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
                 {% trans "Add Books" %}
             {% else %}
                 {% trans "Suggest Books" %}
             {% endif %}
         </h2>
-        {% url 'list' list_id=list.id slug=list.name|slugify as search_url %}
-        {% include "lists/suggestion_search.html" with query_param="q" %}
+        {% include "lists/suggestion_search.html" with query_param="q" search_url=add_book_url %}
     {% endif %}
         <div>
             <h2 class="title is-5 mt-6" id="embed-label">
diff --git a/bookwyrm/templates/lists/suggestion_search.html b/bookwyrm/templates/lists/suggestion_search.html
index f8fa10cbd..a522e4e07 100644
--- a/bookwyrm/templates/lists/suggestion_search.html
+++ b/bookwyrm/templates/lists/suggestion_search.html
@@ -48,7 +48,7 @@
                     class="button is-small is-link"
                     data-modal-open="{{ modal_id }}"
                 >
-                    {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
+                    {% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
                         {% trans "Add" %}
                     {% else %}
                         {% trans "Suggest" %}
diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py
index ecac9f6b8..c1e43a726 100644
--- a/bookwyrm/views/list/list.py
+++ b/bookwyrm/views/list/list.py
@@ -73,6 +73,7 @@ class List(View):
             "embed_url": embed_url,
             "add_failed": add_failed,
             "add_succeeded": add_succeeded,
+            "add_book_url": reverse("list-add-book"),
         }
 
         if request.user.is_authenticated:
diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py
index 3f2cb78f1..3c1635ef5 100644
--- a/bookwyrm/views/suggestion_list.py
+++ b/bookwyrm/views/suggestion_list.py
@@ -56,6 +56,7 @@ class SuggestionList(View):
             "embed_url": embed_url,
             "add_failed": add_failed,
             "add_succeeded": add_succeeded,
+            "add_book_url": reverse("book-add-suggestion", args=[book_id]),
         }
 
         if request.user.is_authenticated: