diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index 0c7f4125c..f17fcfb07 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -1,12 +1,15 @@
 {% from "components/message-count-label.html" import folder_contents_count, message_count_label %}
 
-{% macro format_item_name(name) -%}
+{% macro format_item_name(name, separators=True) -%}
   {%- if name is string -%}
     {{- name -}}
   {%- else -%}
     {%- for part in name -%}
-      {{- format_item_name(part) -}}
-      {%- if not loop.last %} <span class="message-name-separator"></span> {% endif -%}
+      {{- format_item_name(part, separators) -}}
+      {%- if not loop.last -%}
+        {%- if separators %}
+        <span class="message-name-separator"></span>{%- else %} {% endif -%}
+      {% endif -%}
     {%- endfor -%}
   {% endif %}
 {%- endmacro %}
@@ -33,17 +36,20 @@
         {% endfor %}
         {% if item.is_folder %}
           <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=item.id) }}" class="govuk-link govuk-link--no-visited-state template-list-folder">
-            <span class="live-search-relevant">{{ format_item_name(item.name) }}</span>
+            <span class="live-search-relevant">{{- format_item_name(item.name) -}}</span>
           </a>
         {% else %}
           <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}" class="govuk-link govuk-link--no-visited-state template-list-template">
-            <span class="live-search-relevant">{{ format_item_name(item.name) }}</span>
+            <span class="live-search-relevant">{{- format_item_name(item.name) -}}</span>
           </a>
         {% endif %}
       {% endset %}
 
       {% set label_content %}
-        <span class="govuk-visually-hidden">{{ format_item_name(item.name) }}</span>
+        <span class="govuk-visually-hidden">
+          {%- for ancestor in item.ancestors %}{{ format_item_name(ancestor.name, separators=False) }} {% endfor -%}
+          {{ format_item_name(item.name, separators=False) -}}
+        </span>
       {% endset %}
 
       {% set item_meta %}