diff --git a/CHANGES.md b/CHANGES.md
index d6bcf2fae97a10036480b6e197983cd818ae1658..2ab94311f176c6d761b892ffdb13a260fee4b684 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2021-08-16 - Adjust activity_settings_incourse.mustache template based on changes in settings_link_page.mustache
 * 2021-08-16 - Improvement: Adjusted tab appearance for in-course settings.
 * 2021-08-16 - Adjusted settings_link_page.mustache template due to upstream changes in theme Boost.
 * 2021-08-16 - Adjusted loginform.mustache template due to upstream changes in theme Boost.
diff --git a/templates/activity_settings_incourse.mustache b/templates/activity_settings_incourse.mustache
index 710f0ec347f4466888632cdeca3b55328aa813bd..3a1ec48f0e6c06389bdc8f6e8202ec805399f7a3 100644
--- a/templates/activity_settings_incourse.mustache
+++ b/templates/activity_settings_incourse.mustache
@@ -50,14 +50,14 @@
         <ul class="nav nav-tabs" role="tablist">
         <!-- First the top most activitynode and immediate children -->
             <li class="nav-item">
-                <a class="nav-link active" href="#activity-settings-{{key}}" data-toggle="tab" role="tab">{{activitynode.text}}</a>
+                <a class="nav-link active" href="#activity-settings-{{key}}" data-toggle="tab" role="tab" aria-selected="true">{{activitynode.text}}</a>
             </li>
         <!-- Now the first level children with sub activitynodes -->
         {{#activitynode.children}}
             {{#children.count}}
                 {{#display}}
                     <li class="nav-item">
-                        <a class="nav-link" href="#activity-settings-{{key}}" data-toggle="tab" role="tab">{{text}}</a>
+                        <a class="nav-link" href="#activity-settings-{{key}}" data-toggle="tab" role="tab" aria-selected="false" tabindex="-1">{{text}}</a>
                     </li>
                 {{/display}}
             {{/children.count}}