diff --git a/bookwyrm/templates/shelf/search_filter_field.html b/bookwyrm/templates/shelf/search_filter_field.html
index 591e6aaa9..5641bae85 100644
--- a/bookwyrm/templates/shelf/search_filter_field.html
+++ b/bookwyrm/templates/shelf/search_filter_field.html
@@ -4,6 +4,6 @@
 {% block filter %}
   <div class="control">
     <label class="label" for="search_query">{% trans 'Search by keyword' %}</label>
-    <input aria-label="Search by keyword" id="my-books-search" class="input" type="text" name="shelves_q" placeholder="Enter text here" value="{{ shelves_search_query }}" spellcheck="false" />
+    <input aria-label="Search by keyword" id="my-books-search" class="input" type="text" name="shelves_q" placeholder="Enter text here" value="{{ shelves_search_query|default:'' }}" spellcheck="false" />
   </div>
 {% endblock %}
diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index ea5d2343c..4fb78ba6f 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -127,7 +127,10 @@
                 {% endwith %}
 
             </h2>
-            {% include 'shelf/search_filters.html' with user=user query=query %}
+            {% if books|length > 0 %}
+                {% include 'shelf/search_filters.html' with user=user query=query %}
+            {% endif %}
+
         </div>
         {% if is_self and shelf.id %}
         <div class="column is-narrow">