diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 9c5d98c9a26..cbc44bfb4d6 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3816,10 +3816,20 @@ EOD;
      * @return string
      */
     public function more_menu($content, $navbarstyle) {
-        return $this->render_from_template('core/moremenu', (object) [
-            'nodearray' => $content,
-            'navbarstyle' => $navbarstyle
-        ]);
+        if (is_object($content)) {
+            if (!isset($content->children) || count($content->children) == 0) {
+                return false;
+            }
+            return $this->render_from_template('core/moremenu', (object) [
+                'nodecollection' => $content,
+                'navbarstyle' => $navbarstyle
+            ]);
+        } else {
+            return $this->render_from_template('core/moremenu', (object) [
+                'nodearray' => $content,
+                'navbarstyle' => $navbarstyle
+            ]);
+        }
     }
 
     /**
diff --git a/lib/templates/moremenu.mustache b/lib/templates/moremenu.mustache
index 0b63ff6c355..b142edd9928 100644
--- a/lib/templates/moremenu.mustache
+++ b/lib/templates/moremenu.mustache
@@ -46,6 +46,11 @@
 }}
 <nav class="moremenu">
     <ul id="moremenu-{{ uniqid }}" class="nav {{navbarstyle}}">
+        {{#nodecollection}}
+            {{#children}}
+                {{> core/moremenu_children}}
+            {{/children}}
+        {{/nodecollection}}
         {{#nodearray}}
             {{> core/moremenu_children}}
         {{/nodearray}}
diff --git a/lib/templates/moremenu_children.mustache b/lib/templates/moremenu_children.mustache
index 4e10461f972..0d9459b8681 100644
--- a/lib/templates/moremenu_children.mustache
+++ b/lib/templates/moremenu_children.mustache
@@ -49,7 +49,7 @@
 {{/haschildren}}
 {{^haschildren}}
     <li class="nav-item">
-        <a class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}" href="{{{url}}}" role="menuitem" {{#isactive}}aria-current="true"{{/isactive}}>
+        <a class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}" href="{{{url}}}{{{action}}}" role="menuitem" {{#isactive}}aria-current="true"{{/isactive}}>
             {{{text}}}
         </a>
     </li>
diff --git a/theme/boost/layout/columns2.php b/theme/boost/layout/columns2.php
index 3498b762ca8..f558b268de7 100644
--- a/theme/boost/layout/columns2.php
+++ b/theme/boost/layout/columns2.php
@@ -57,6 +57,7 @@ $templatecontext = [
     'regionmainsettingsmenu' => $regionmainsettingsmenu,
     'hasregionmainsettingsmenu' => !empty($regionmainsettingsmenu),
     'primarymoremenu' => $OUTPUT->more_menu(array_merge($primarymenu['primary'], $primarymenu['custom']), 'navbar-nav'),
+    'secondarymoremenu' => $OUTPUT->more_menu($PAGE->secondarynav, 'nav-tabs'),
 ];
 $nav = $PAGE->flatnav;
 $templatecontext['flatnavigation'] = $nav;
diff --git a/theme/boost/scss/moodle.scss b/theme/boost/scss/moodle.scss
index 9351930aba4..c1870a596fc 100644
--- a/theme/boost/scss/moodle.scss
+++ b/theme/boost/scss/moodle.scss
@@ -46,3 +46,4 @@ $breadcrumb-divider-rtl: "◀" !default;
 @import "moodle/reportbuilder";
 @import "moodle/moremenu";
 @import "moodle/primarynavigation";
+@import "moodle/secondarynavigation";
diff --git a/theme/boost/scss/moodle/moremenu.scss b/theme/boost/scss/moodle/moremenu.scss
index 743fe123095..a4aa8aaa2e0 100644
--- a/theme/boost/scss/moodle/moremenu.scss
+++ b/theme/boost/scss/moodle/moremenu.scss
@@ -9,6 +9,9 @@
         display: flex;
         align-items: center;
     }
+    .nav-tabs {
+        margin-left: 0;
+    }
     // Styling for dropdown menus inside the MoreButton.
     .dropdownmoremenu > .dropdown-menu {
         & > .dropdown-item {
diff --git a/theme/boost/scss/moodle/secondarynavigation.scss b/theme/boost/scss/moodle/secondarynavigation.scss
new file mode 100644
index 00000000000..0fbf2165446
--- /dev/null
+++ b/theme/boost/scss/moodle/secondarynavigation.scss
@@ -0,0 +1,6 @@
+.secondarynavigation {
+    z-index: 1;
+    .moremenu {
+        margin-bottom: -1px;
+    }
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 0445fab5085..4d9d8e4f751 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -20047,6 +20047,8 @@ div.editor_atto_toolbar button .icon {
     height: 40px;
     display: flex;
     align-items: center; }
+  .moremenu .nav-tabs {
+    margin-left: 0; }
   .moremenu .dropdownmoremenu > .dropdown-menu > .dropdown-item {
     padding: 0; }
   .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu {
@@ -20068,6 +20070,11 @@ div.editor_atto_toolbar button .icon {
   .navbar.fixed-top .moremenu .nav-link {
     height: 50px; }
 
+.secondarynavigation {
+  z-index: 1; }
+  .secondarynavigation .moremenu {
+    margin-bottom: -1px; }
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale; }
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index c198024ea18..c5b141090cc 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -62,7 +62,9 @@
 
     <div id="page" class="container-fluid d-print-block">
         {{{ output.full_header }}}
-
+        <div class="secondarynavigation">
+            {{{ secondarymoremenu }}}
+        </div>
         <div id="page-content" class="row pb-3 d-print-block">
             <div id="region-main-box" class="col-12">
                 {{#hasregionmainsettingsmenu}}
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 3b6787d615d..feda4658c79 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -20238,6 +20238,8 @@ div.editor_atto_toolbar button .icon {
     height: 40px;
     display: flex;
     align-items: center; }
+  .moremenu .nav-tabs {
+    margin-left: 0; }
   .moremenu .dropdownmoremenu > .dropdown-menu > .dropdown-item {
     padding: 0; }
   .moremenu .dropdownmoremenu > .dropdown-menu .dropdown-menu {
@@ -20259,6 +20261,11 @@ div.editor_atto_toolbar button .icon {
   .navbar.fixed-top .moremenu .nav-link {
     height: 50px; }
 
+.secondarynavigation {
+  z-index: 1; }
+  .secondarynavigation .moremenu {
+    margin-bottom: -1px; }
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale; }