diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php
index bc27b939016..e38fe9bd97d 100644
--- a/theme/boost/classes/output/core_renderer.php
+++ b/theme/boost/classes/output/core_renderer.php
@@ -606,6 +606,7 @@ class core_renderer extends \core_renderer {
 
         if ($context->contextlevel == CONTEXT_MODULE) {
 
+            $this->page->navigation->initialise();
             $node = $this->page->navigation->find_active_node();
             $buildmenu = false;
             // If the settings menu has been forced then show the menu.
diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
index 2b93cf9daf4..598c0e89414 100644
--- a/theme/boost/scss/moodle/blocks.scss
+++ b/theme/boost/scss/moodle/blocks.scss
@@ -62,3 +62,9 @@ $blocks-plus-gutter: $blocks-column-width + $grid-gutter-width;
         width: 100%;
     }
 }
+
+[data-region="blocks-column"] {
+    @include media-breakpoint-down(md) {
+        width: 100%;
+    }
+}
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index 85155463809..e12306ed488 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -65,23 +65,12 @@
 
         <div id="page-content" class="row">
             <div id="region-main-box" class="col-xs-12">
-                {{#hasblocks}}
-                <section data-region="blocks-column" class="hidden-md-down">
-                    {{{ sidepreblocks }}}
-                </section>
                 {{#hasregionmainsettingsmenu}}
-                    <div id="region-main-settings-menu" class="has-blocks">
-                        <div> {{{ regionmainsettingsmenu }}} </div>
-                    </div>
-                {{/hasregionmainsettingsmenu}}
-                <section id="region-main" class="has-blocks">
-                {{/hasblocks}}
-                {{^hasblocks}}
-                <div id="region-main-settings-menu">
+                <div id="region-main-settings-menu" {{#hasblocks}}class="has-blocks"{{/hasblocks}}>
                     <div> {{{ output.region_main_settings_menu }}} </div>
                 </div>
-                <section id="region-main">
-                {{/hasblocks}}
+                {{/hasregionmainsettingsmenu}}
+                <section id="region-main" {{#hasblocks}}class="has-blocks"{{/hasblocks}}>
                     <div class="card card-block">
                     {{#hasregionmainsettingsmenu}}
                         <div class="region_main_settings_menu_proxy"></div>
@@ -91,6 +80,11 @@
                     {{{ output.course_content_footer }}}
                     </div>
                 </section>
+                {{#hasblocks}}
+                <section data-region="blocks-column">
+                    {{{ sidepreblocks }}}
+                </section>
+                {{/hasblocks}}
             </div>
         </div>
     </div>