diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
index d9eb9399..2e772d0a 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
@@ -27,11 +27,19 @@
 {% endblock %}
 
 {% block agenda-settings-extra-tab-buttons %}
-    <button aria-controls="panel-meeting-types" aria-selected="true" id="tab-meeting-types" role="tab" tabindex="0">{% trans "Meeting Types" %}</button>
+    <button aria-controls="panel-meeting-types"
+            aria-selected="{{meeting_types|yesno:"false,true"}}"
+            id="tab-meeting-types" role="tab"
+            tabindex="{{meeting_types|yesno:"-1,0"}}"
+            >{% trans "Meeting Types" %}</button>
     {% if object.desk_simple_management %}
     <button aria-controls="panel-desks" aria-selected="false" id="tab-desks" role="tab" tabindex="-1">{% trans "Desks" %}</button>
     {% endif %}
-    <button aria-controls="panel-time-periods" aria-selected="false" id="tab-time-periods" role="tab" tabindex="-1">{% trans "Time Periods" %}</button>
+    <button aria-controls="panel-time-periods"
+            aria-selected="{{meeting_types|yesno:"true,false"}}"
+            id="tab-time-periods" role="tab"
+            tabindex="{{meeting_types|yesno:"0"}}"
+            >{% trans "Time Periods" %}</button>
     {% if has_resources %}
     <button aria-controls="panel-resources" aria-selected="false" id="tab-resources" role="tab" tabindex="-1">{% trans "Resources" %}</button>
     {% endif %}
@@ -40,7 +48,8 @@
 
 {% block agenda-settings-extra-tab-list %}
 
-    <div aria-labelledby="tab-meeting-types" id="panel-meeting-types" role="tabpanel" tabindex="0">
+    <div aria-labelledby="tab-meeting-types" id="panel-meeting-types" role="tabpanel" tabindex="0"
+              {% if meeting_types %}hidden{% endif %}>
       {% if meeting_types %}
       <ul class="objects-list single-links">
         {% for meeting_type in meeting_types %}
@@ -77,7 +86,7 @@
     </div>
     {% endif %}
 
-    <div aria-labelledby="tab-time-periods" hidden="" id="panel-time-periods" role="tabpanel" tabindex="0">
+    <div aria-labelledby="tab-time-periods" {% if not meeting_types %}hidden{% endif %}id="panel-time-periods" role="tabpanel" tabindex="0">
       {% if object.prefetched_desks %}
       <div class="timeperiods">
         {% for desk in object.prefetched_desks %}