diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index ab917225e..a9e74658f 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -102,13 +102,16 @@ def choose_template(service_id, template_type='all'):
         ])
     ]
 
+    templates_on_page = [
+        template for template in templates
+        if template_type in ['all', template['template_type']]
+    ]
+
     return render_template(
         'views/templates/choose.html',
-        templates=[
-            template for template in templates
-            if template_type in ['all', template['template_type']]
-        ],
-        show_template_nav=has_multiple_template_types,
+        templates=templates_on_page,
+        show_search_box=(len(templates_on_page) > 7),
+        show_template_nav=has_multiple_template_types and (len(templates) > 2),
         template_nav_items=template_nav_items,
         template_type=template_type,
         search_form=SearchTemplatesForm(),
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index e055c8b71..8641db60b 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -54,7 +54,7 @@
       </div>
     {% endif %}
 
-    {% if templates|length > 7 %}
+    {% if show_search_box %}
       <div data-module="autofocus">
         <div class="live-search" data-module="live-search" data-targets="#template-list .column-whole">
           {{ textbox(