diff --git a/tabellio/agenda/folder_templates/view.pt b/tabellio/agenda/folder_templates/view.pt
index 45d1a99..065014f 100644
--- a/tabellio/agenda/folder_templates/view.pt
+++ b/tabellio/agenda/folder_templates/view.pt
@@ -15,7 +15,8 @@
 
         <div tal:replace="structure provider:plone.abovecontenttitle" />
 
-        <h1 class="documentFirstHeading" tal:content="context/title" />
+        <h1 tal:condition="view/has_view_switcher"  class="documentFirstHeading">Agenda</h1>
+        <h1 tal:condition="not: view/has_view_switcher"  class="documentFirstHeading" tal:content="context/title" />
 
         <div tal:replace="structure provider:plone.belowcontenttitle" />
 
@@ -23,6 +24,7 @@
 
         <div id="content-core" tal:condition="view/as_month">
 
+        <h2 tal:condition="view/has_view_switcher" tal:content="context/title" />
         <div tal:condition="view/has_view_switcher" id="agenda-view-switcher">
           <span>Calendrier</span> | <a tal:attributes="href string:list?navyear=${view/year}&navmonth=${view/month}">Liste</a>
         </div>
@@ -157,6 +159,7 @@ jq('#tabellio-agenda tbody a').click(
 
         <div id="content-core" tal:condition="python: view.as_list() or view.as_seances()">
 
+        <h2 tal:condition="view/has_view_switcher" tal:content="context/title" />
         <div tal:condition="view/has_view_switcher" id="agenda-view-switcher">
           <a tal:attributes="href string:?navyear=${view/year}&navmonth=${view/month}">Calendrier</a> | <span>Liste</span>
         </div>