diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 3285534d9..b5b261a97 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -108,7 +108,15 @@ def start_tour(service_id, template_id):
 def choose_template(service_id, template_type='all', template_folder_id=None):
 
     template_nav_items = [
-        (label, key, url_for('.choose_template', service_id=current_service.id, template_type=key), '')
+        (
+            label,
+            key,
+            url_for(
+                '.choose_template', service_id=current_service.id,
+                template_type=key, template_folder_id=template_folder_id
+            ),
+            ''
+        )
         for label, key in filter(None, [
             ('All', 'all'),
             ('Text message', 'sms'),