diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss
index 5bfc1504b25..30f2dc5d23d 100644
--- a/theme/boost/scss/moodle/admin.scss
+++ b/theme/boost/scss/moodle/admin.scss
@@ -250,14 +250,14 @@
 .path-admin,
 .format-site {
     .header-maxwidth,
-    .secondary-navigation {
+    .secondary-navigation .navigation .nav-tabs {
         max-width: none;
     }
 }
 .path-admin.path-admin-roles:not(.format-site),
 .path-admin.path-admin-tool-lp {
     .header-maxwidth,
-    .secondary-navigation {
+    .secondary-navigation .navigation .nav-tabs {
         max-width: $course-content-maxwidth;
     }
 }
diff --git a/theme/boost/scss/moodle/secondarynavigation.scss b/theme/boost/scss/moodle/secondarynavigation.scss
index 32a50bbfbd9..b82a70b0e53 100644
--- a/theme/boost/scss/moodle/secondarynavigation.scss
+++ b/theme/boost/scss/moodle/secondarynavigation.scss
@@ -1,14 +1,14 @@
 .secondary-navigation {
-    max-width: $course-content-maxwidth;
-    margin: 0 auto;
     padding-bottom: 15px;
     .navigation {
-        border-top: 1px solid $nav-tabs-border-color;
         border-bottom: 1px solid $nav-tabs-border-color;
-        height: calc(#{$moremenu-height} + 2px);
         background-color: $body-bg;
+        margin: 0 -0.5rem;
+        padding: 0 0.5rem;
         .nav-tabs {
             border: none;
+            max-width: $course-content-maxwidth;
+            margin: 0 auto;
             .nav-link {
                 border-radius: initial;
             }
@@ -17,7 +17,7 @@
 }
 
 @include media-breakpoint-up(md) {
-    .secondary-navigation {
-        padding: 0 15px 15px;
+    .secondary-navigation .navigation {
+        padding: 0 calc(0.5rem + 15px);
     }
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index d79c3c5f9bc..a964fd79a9a 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -12630,15 +12630,15 @@ body.dragging .dragging {
   margin: 0; }
 
 .path-admin .header-maxwidth,
-.path-admin .secondary-navigation,
+.path-admin .secondary-navigation .navigation .nav-tabs,
 .format-site .header-maxwidth,
-.format-site .secondary-navigation {
+.format-site .secondary-navigation .navigation .nav-tabs {
   max-width: none; }
 
 .path-admin.path-admin-roles:not(.format-site) .header-maxwidth,
-.path-admin.path-admin-roles:not(.format-site) .secondary-navigation,
+.path-admin.path-admin-roles:not(.format-site) .secondary-navigation .navigation .nav-tabs,
 .path-admin.path-admin-tool-lp .header-maxwidth,
-.path-admin.path-admin-tool-lp .secondary-navigation {
+.path-admin.path-admin-tool-lp .secondary-navigation .navigation .nav-tabs {
   max-width: 830px; }
 
 .plugincheckwrapper {
@@ -21677,22 +21677,22 @@ div.editor_atto_toolbar button .icon {
       border-right: 0; }
 
 .secondary-navigation {
-  max-width: 830px;
-  margin: 0 auto;
   padding-bottom: 15px; }
   .secondary-navigation .navigation {
-    border-top: 1px solid #dee2e6;
     border-bottom: 1px solid #dee2e6;
-    height: calc(60px + 2px);
-    background-color: #fff; }
+    background-color: #fff;
+    margin: 0 -0.5rem;
+    padding: 0 0.5rem; }
     .secondary-navigation .navigation .nav-tabs {
-      border: none; }
+      border: none;
+      max-width: 830px;
+      margin: 0 auto; }
       .secondary-navigation .navigation .nav-tabs .nav-link {
         border-radius: initial; }
 
 @media (min-width: 768px) {
-  .secondary-navigation {
-    padding: 0 15px 15px; } }
+  .secondary-navigation .navigation {
+    padding: 0 calc(0.5rem + 15px); } }
 
 .tertiary-navigation {
   padding-top: 10px; }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index fdcf06dee2c..9402ecff067 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -12630,15 +12630,15 @@ body.dragging .dragging {
   margin: 0; }
 
 .path-admin .header-maxwidth,
-.path-admin .secondary-navigation,
+.path-admin .secondary-navigation .navigation .nav-tabs,
 .format-site .header-maxwidth,
-.format-site .secondary-navigation {
+.format-site .secondary-navigation .navigation .nav-tabs {
   max-width: none; }
 
 .path-admin.path-admin-roles:not(.format-site) .header-maxwidth,
-.path-admin.path-admin-roles:not(.format-site) .secondary-navigation,
+.path-admin.path-admin-roles:not(.format-site) .secondary-navigation .navigation .nav-tabs,
 .path-admin.path-admin-tool-lp .header-maxwidth,
-.path-admin.path-admin-tool-lp .secondary-navigation {
+.path-admin.path-admin-tool-lp .secondary-navigation .navigation .nav-tabs {
   max-width: 830px; }
 
 .plugincheckwrapper {
@@ -21623,22 +21623,22 @@ div.editor_atto_toolbar button .icon {
       border-right: 0; }
 
 .secondary-navigation {
-  max-width: 830px;
-  margin: 0 auto;
   padding-bottom: 15px; }
   .secondary-navigation .navigation {
-    border-top: 1px solid #dee2e6;
     border-bottom: 1px solid #dee2e6;
-    height: calc(50px + 2px);
-    background-color: #fff; }
+    background-color: #fff;
+    margin: 0 -0.5rem;
+    padding: 0 0.5rem; }
     .secondary-navigation .navigation .nav-tabs {
-      border: none; }
+      border: none;
+      max-width: 830px;
+      margin: 0 auto; }
       .secondary-navigation .navigation .nav-tabs .nav-link {
         border-radius: initial; }
 
 @media (min-width: 768px) {
-  .secondary-navigation {
-    padding: 0 15px 15px; } }
+  .secondary-navigation .navigation {
+    padding: 0 calc(0.5rem + 15px); } }
 
 .tertiary-navigation {
   padding-top: 10px; }