diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 7b0f6309d..25d51820e 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -9,13 +9,18 @@
 
 {% block service_page_title %}
   {{ page_title }}
+  {% for folder in template_folder_path %}
+    / {{ folder.name }}
+  {% endfor %}
 {% endblock %}
 
 {% block maincolumn_content %}
 
   {% if (not templates) and (not template_folder_path) %}
 
-    <h1 class="heading-large">{{ page_title }}</h1>
+    <h1 class="heading-large">
+      {{ page_title }}
+    </h1>
     {% if current_user.has_permissions('manage_templates') %}
        <p class="bottom-gutter">
          You need a template before you can send
@@ -41,7 +46,21 @@
 
     <div class="grid-row bottom-gutter-2-3">
       <div class="column-two-thirds">
-        <h1 class="heading-large">{{ page_title }}</h1>
+        <h1 class="heading-large">
+          {% if template_folder_path %}
+            <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type) }}">{{ page_title }}</a>
+          {% else %}
+            {{ page_title }}
+          {% endif %}
+          {% for folder in template_folder_path %}
+            /
+            {% if loop.last %}
+              {{ folder.name }}
+            {% else %}
+              <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a>
+            {% endif %}
+          {% endfor %}
+        </h1>
       </div>
       {% if current_user.has_permissions('manage_templates') %}
         <div class="column-one-third">
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index 3e9118248..3a4725f0d 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -158,7 +158,7 @@ def test_accepting_invite_removes_invite_from_session(
         token='thisisnotarealtoken',
         _follow_redirects=True,
     )
-    assert page.h1.string == landing_page_title
+    assert normalize_spaces(page.h1.string) == landing_page_title
 
     with client_request.session_transaction() as session:
         assert 'invited_user' not in session