diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 670f167a2..ad713267d 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -104,8 +104,12 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
 
     template_list = TemplateList(current_service, template_type, template_folder_id, current_user)
 
+    all_template_folders = [
+        item.folder for item in TemplateList(service=current_service, user=current_user) if item.is_folder
+    ]
+
     templates_and_folders_form = TemplateAndFoldersSelectionForm(
-        all_template_folders=current_service.get_user_template_folders(current_user),
+        all_template_folders=all_template_folders,
         template_list=template_list,
         template_type=template_type,
         available_template_types=current_service.available_template_types,
diff --git a/app/models/template_list.py b/app/models/template_list.py
index 144a4675a..e0e8b4563 100644
--- a/app/models/template_list.py
+++ b/app/models/template_list.py
@@ -157,6 +157,7 @@ class TemplateListFolder(TemplateListItem):
         service_id,
     ):
         super().__init__(folder, ancestors)
+        self.folder = folder
         self.service_id = service_id
         self.number_of_templates = len(templates)
         self.number_of_folders = len(folders)