diff --git a/CHANGES.md b/CHANGES.md
index 52e2e28f48053c9b27f995733528944ccfce5347..d7fcb84ca8fe8ac345ada372a8be86bdd5d02806 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2020-06-04 - Adjusted columns2.mustache template due to upstream changes in theme Boost.
 * 2020-06-04 - Making Travis happy again.
 
 ### Release v3.8-r1
diff --git a/templates/columns2.mustache b/templates/columns2.mustache
index 70b96ac6f852d40e0ce6082d42ee34b478f5e65d..28c3a5e0d6aca954bfc88b7c15b53bd5194574ba 100644
--- a/templates/columns2.mustache
+++ b/templates/columns2.mustache
@@ -69,6 +69,7 @@
     {{{ output.standard_top_of_body_html }}}
 
     {{> theme_boost_campus/navbar }}
+    {{> theme_boost/nav-drawer }}
 
     <div id="page" class="container-fluid d-print-block">
         {{{ output.full_header }}}
@@ -106,7 +107,6 @@
         </div>
     </div>
     {{{ output.standard_after_main_region_html }}}
-    {{> theme_boost/nav-drawer }}
     {{{ pagebottomelements }}}
 </div>
 {{! Moved the variable here from footer.mustache to solve Javascript issues with behat tests. }}
diff --git a/templates/columns2.mustache.original b/templates/columns2.mustache.original
index 28a50ad895e2f91a6768899d98ff61fe5ed17e4d..b109c93ffcad7522f68e606119bdb90a3ab43454 100644
--- a/templates/columns2.mustache.original
+++ b/templates/columns2.mustache.original
@@ -58,6 +58,7 @@
     {{{ output.standard_top_of_body_html }}}
 
     {{> theme_boost/navbar }}
+    {{> theme_boost/nav-drawer }}
 
     <div id="page" class="container-fluid d-print-block">
         {{{ output.full_header }}}
@@ -89,7 +90,6 @@
         </div>
     </div>
     {{{ output.standard_after_main_region_html }}}
-    {{> theme_boost/nav-drawer }}
     {{> theme_boost/footer }}
 </div>