diff --git a/app/main/forms.py b/app/main/forms.py
index aa5c54ab8..4a1461b2c 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1285,6 +1285,15 @@ class ReturnedLettersForm(StripWhitespaceForm):
 
 
 class TemplateFolderForm(StripWhitespaceForm):
+    def __init__(self, users_with_permission=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if users_with_permission is not None:
+            self.viewing_permissions.users_with_permission = users_with_permission
+            self.viewing_permissions.choices = [
+                (item.id, item.name) for item in users_with_permission
+            ]
+
+    viewing_permissions = MultiCheckboxField('Users who can see this folder:')
     name = StringField('Folder name', validators=[DataRequired(message='Can’t be empty')])
 
 
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index a16564748..fd3eab99a 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -430,9 +430,13 @@ def action_blocked(service_id, notification_type, return_to, template_id):
 @login_required
 @user_has_permissions('manage_templates')
 def manage_template_folder(service_id, template_folder_id):
-
+    current_folder = current_service.get_template_folder(template_folder_id)
+    users_with_folder_permission = [
+        current_service.get_team_member(user_id) for user_id in current_folder['users_with_permission']
+    ]
     form = TemplateFolderForm(
-        name=current_service.get_template_folder(template_folder_id)['name']
+        name=current_folder['name'],
+        users_with_permission=users_with_folder_permission
     )
 
     if form.validate_on_submit():
@@ -449,7 +453,7 @@ def manage_template_folder(service_id, template_folder_id):
         template_folder_path=current_service.get_template_folder_path(template_folder_id),
         current_service_id=current_service.id,
         template_folder_id=template_folder_id,
-        template_type="all"
+        template_type="all",
     )
 
 
diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html
index f2aa3748f..9541e9106 100644
--- a/app/templates/views/templates/manage-template-folder.html
+++ b/app/templates/views/templates/manage-template-folder.html
@@ -1,6 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/folder-path.html" import folder_path, page_title_folder_path %}
 {% from "components/textbox.html" import textbox %}
+{% from "components/checkbox.html" import checkbox, checkbox_group %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
@@ -24,8 +25,9 @@
   {% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
     {{ textbox(form.name) }}
     {% if current_service.has_permission("edit_folder_permissions") %}
-      <p id="users-with-permissions">Users who can see this folder:</p>
+      {{ checkbox_group("Users who can see this folder:", form.viewing_permissions) }}
     {% endif %}
+
     {{ page_footer(
       'Save',
       delete_link=url_for(
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index d59f20e6e..976b7b164 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -418,16 +418,21 @@ def test_can_create_email_template_with_parent_folder(
 @pytest.mark.parametrize("folder_permissions, expected_len", [(['edit_folder_permissions'], 1), ([], 0)])
 def test_get_manage_folder_page(
     client_request,
+    active_user_with_permissions,
     service_one,
     mock_get_template_folders,
+    mocker,
     folder_permissions,
-    expected_len
+    expected_len,
 ):
     service_one["permissions"] += folder_permissions
     folder_id = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
-        {'id': folder_id, 'name': 'folder_two', 'parent_id': None},
+        {'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
+            active_user_with_permissions.id
+        ]},
     ]
+    mocker.patch('app.models.service.Service.get_team_member', return_value=active_user_with_permissions)
 
     page = client_request.get(
         'main.manage_template_folder',
@@ -443,9 +448,14 @@ def test_get_manage_folder_page(
     expected_delete_url = "/services/{}/templates/folders/{}/delete".format(service_one['id'], folder_id)
     assert expected_delete_url in delete_link["href"]
 
-    assert len(page.select('p[id=users-with-permissions]')) == expected_len
+    form_labels = page.select('legend[class=form-label]')
+    assert len(form_labels) == expected_len
     if expected_len == 1:
-        assert page.select('p[id=users-with-permissions]')[0].text == "Users who can see this folder:"
+        assert "Users who can see this folder:" in form_labels[0].text
+        checkboxes = page.select('input[name=viewing_permissions]')
+        assert len(checkboxes) == 1
+        assert checkboxes[0]['value'] == 'y'
+        assert "Test User" in page.findAll('label', {'for': 'viewing_permissions-0'})[0].text
 
 
 def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
@@ -470,12 +480,15 @@ def test_get_manage_folder_page_no_permissions(
     )
 
 
-def test_rename_folder(client_request, service_one, mock_get_template_folders, mocker):
+def test_rename_folder(client_request, active_user_with_permissions, service_one, mock_get_template_folders, mocker):
     mock_update = mocker.patch('app.template_folder_api_client.update_template_folder')
     folder_id = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
-        {'id': folder_id, 'name': 'folder_two', 'parent_id': None},
+        {'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
+            active_user_with_permissions.id
+        ]}
     ]
+    mocker.patch('app.models.service.Service.get_team_member', return_value=active_user_with_permissions)
 
     client_request.post(
         'main.manage_template_folder',