diff --git a/app/main/forms.py b/app/main/forms.py
index c7f5234ca..cac7e250f 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1895,7 +1895,9 @@ class TemplateFolderForm(StripWhitespaceForm):
                 (item.id, item.name) for item in all_service_users
             ]
 
-    users_with_permission = MultiCheckboxField('Team members who can see this folder')
+    users_with_permission = govukCollapsibleCheckboxesField(
+        'Team members who can see this folder',
+        field_label='folder')
     name = StringField('Folder name', validators=[DataRequired(message='Cannot be empty')])
 
 
diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html
index ddc20df80..6c817014b 100644
--- a/app/templates/views/templates/manage-template-folder.html
+++ b/app/templates/views/templates/manage-template-folder.html
@@ -26,7 +26,7 @@
   {% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
     {{ textbox(form.name, width='1-1') }}
     {% if current_user.has_permissions("manage_service") and form.users_with_permission.all_service_users %}
-      {{ checkboxes(form.users_with_permission, collapsible_opts={ 'field': 'team member' }) }}
+      {{ form.users_with_permission }}
     {% endif %}
 
     {{ page_footer(