diff --git a/CHANGES.md b/CHANGES.md
index faaf9437ccbf40c00b5f5c1a1909e0cc272e604f..a6aa7e04447b4a94494db01bf63a5aa8f6ce3729 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 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.
 * 2021-08-16 - Bugfix: Remove overwritten template full_header.mustache. If the setting showsettingsincourse is enabled, this will place the cog icon _over_ instead of _near_ the edit button. This will fix a presentation issue with the in-course settings menu on smaller screens.  
 * 2021-08-16 - Improvement: Re-add the margin below the breadcrumb as this does not need to differ between theme_boost and theme_boost_campus anymore
diff --git a/templates/settings_link_page.mustache b/templates/settings_link_page.mustache
index ac3852b01961f46e7997c06766623304a1ba608b..e0553253c03c6f7fb28b34d52e2f6593911c86d2 100644
--- a/templates/settings_link_page.mustache
+++ b/templates/settings_link_page.mustache
@@ -49,14 +49,14 @@
         <ul class="nav nav-tabs" role="tablist">
         <!-- First the top most node and immediate children -->
             <li class="nav-item">
-                <a class="nav-link active" href="#course-settings-{{node.key}}" data-toggle="tab" role="tab">{{node.text}}</a>
+                <a class="nav-link active" href="#course-settings-{{node.key}}" data-toggle="tab" role="tab" aria-selected="true">{{node.text}}</a>
             </li>
         <!-- Now the first level children with sub nodes -->
         {{#node.children}}
             {{#children.count}}
                 {{#display}}
                     <li class="nav-item">
-                        <a class="nav-link" href="#course-settings-{{key}}" data-toggle="tab" role="tab">{{text}}</a>
+                        <a class="nav-link" href="#course-settings-{{key}}" data-toggle="tab" role="tab" aria-selected="false" tabindex="-1">{{text}}</a>
                     </li>
                 {{/display}}
             {{/children.count}}
diff --git a/templates/settings_link_page.mustache.original b/templates/settings_link_page.mustache.original
index c763f4b5c0c82789e0e6ecac047a04172d4e8477..07f070599920f013beb53d62e83180d4ca47cf48 100644
--- a/templates/settings_link_page.mustache.original
+++ b/templates/settings_link_page.mustache.original
@@ -40,7 +40,7 @@
 <ul class="nav nav-tabs" role="tablist">
 <!-- First the top most node and immediate children -->
     <li class="nav-item">
-        <a class="nav-link active" href="#link{{node.key}}" data-toggle="tab" role="tab">{{node.text}}</a>
+        <a class="nav-link active" href="#link{{node.key}}" data-toggle="tab" role="tab" aria-selected="true">{{node.text}}</a>
     </li>
 <!-- Now the first level children with sub nodes -->
 {{#node.children}}
@@ -48,7 +48,7 @@
         {{#display}}
             {{^is_short_branch}}
                 <li class="nav-item">
-                    <a class="nav-link" href="#link{{key}}" data-toggle="tab" role="tab">{{text}}</a>
+                    <a class="nav-link" href="#link{{key}}" data-toggle="tab" role="tab" aria-selected="false" tabindex="-1">{{text}}</a>
                 </li>
             {{/is_short_branch}}
         {{/display}}
@@ -82,8 +82,8 @@
                             <hr>
                             <div class="row">
                                 <div class="col-sm-3">
-                                    {{#action}}<h4><a href="{{action}}">{{text}}</a><h4>{{/action}}
-                                    {{^action}}<h4>{{text}}<h4>{{/action}}
+                                    {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
+                                    {{^action}}<h4>{{text}}</h4>{{/action}}
                                 </div>
                                 <div class="col">
                                     <ul class="list-unstyled">
@@ -105,8 +105,8 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-sm-3">
-                            {{#action}}<h4><a href="{{action}}">{{text}}</a><h4>{{/action}}
-                            {{^action}}<h4>{{text}}<h4>{{/action}}
+                            {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
+                            {{^action}}<h4>{{text}}</h4>{{/action}}
                         </div>
                         <div class="col-sm-9">
                             <ul class="list-unstyled">
@@ -126,8 +126,8 @@
                                 <hr>
                                 <div class="row">
                                     <div class="col-sm-3">
-                                        {{#action}}<h4><a href="{{action}}">{{text}}</a><h4>{{/action}}
-                                        {{^action}}<h4>{{text}}<h4>{{/action}}
+                                        {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
+                                        {{^action}}<h4>{{text}}</h4>{{/action}}
                                     </div>
                                     <div class="col-sm-9">
                                         <ul class="list-unstyled">