diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index bdcb9da25ff..c30590eacba 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -393,7 +393,7 @@ img.activityicon {
 #maincontent {
     display: block;
     height: 1px;
-    overflow: hidden;
+    overflow: clip;
 }
 
 img.uihint {
diff --git a/theme/boost/scss/moodle/drawer.scss b/theme/boost/scss/moodle/drawer.scss
index a57de7fbe13..cf3b20e50aa 100644
--- a/theme/boost/scss/moodle/drawer.scss
+++ b/theme/boost/scss/moodle/drawer.scss
@@ -11,7 +11,8 @@ $drawer-bg-color: $gray-100 !default;
 $drawer-scroll-bg-track: $gray-100 !default;
 $drawer-shadow-color: rgba(0, 0, 0, .25) !default;
 
-:target {
+:target,
+:focus {
     scroll-margin-top: $fixed-header-y + 10px;
 }
 
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 3aa5f2604b3..bf5640e94d0 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -23282,7 +23282,7 @@ img.activityicon {
 #maincontent {
   display: block;
   height: 1px;
-  overflow: hidden;
+  overflow: clip;
 }
 
 img.uihint {
@@ -29948,7 +29948,8 @@ span.editinstructions .alert-link {
 }
 
 /* Anchor link offset fix. This makes hash links scroll 60px down to account for the fixed header. */
-:target {
+:target,
+:focus {
   scroll-margin-top: 70px;
 }
 
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 59570e84395..2e880c94d02 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -23282,7 +23282,7 @@ img.activityicon {
 #maincontent {
   display: block;
   height: 1px;
-  overflow: hidden;
+  overflow: clip;
 }
 
 img.uihint {
@@ -29948,7 +29948,8 @@ span.editinstructions .alert-link {
 }
 
 /* Anchor link offset fix. This makes hash links scroll 60px down to account for the fixed header. */
-:target {
+:target,
+:focus {
   scroll-margin-top: 60px;
 }