diff --git a/client/src/client-only-routes/show-settings.tsx b/client/src/client-only-routes/show-settings.tsx
index 298674ecb18..b941dfa6f21 100644
--- a/client/src/client-only-routes/show-settings.tsx
+++ b/client/src/client-only-routes/show-settings.tsx
@@ -161,7 +161,11 @@ export function ShowSettings(props: ShowSettingsProps): JSX.Element {
       <Grid>
         <main>
           <Spacer size='large' />
-          <h1 className='text-center' style={{ overflowWrap: 'break-word' }}>
+          <h1
+            id='content-start'
+            className='text-center'
+            style={{ overflowWrap: 'break-word' }}
+          >
             {t('settings.for', { username: username })}
           </h1>
           <About
diff --git a/client/src/components/FourOhFour/index.tsx b/client/src/components/FourOhFour/index.tsx
index f122357e88f..90470763f01 100644
--- a/client/src/components/FourOhFour/index.tsx
+++ b/client/src/components/FourOhFour/index.tsx
@@ -18,7 +18,7 @@ const FourOhFour = (_props: RouteComponentProps): JSX.Element => {
       <Helmet title={t('404.page-not-found') + '| freeCodeCamp'} />
       <img alt={t('404.not-found')} src={notFoundLogo} />
       <Spacer size='medium' />
-      <h1>{t('404.page-not-found')}.</h1>
+      <h1 id='content-start'>{t('404.page-not-found')}.</h1>
       <Spacer size='medium' />
       <div>
         <p>{t('404.heres-a-quote')}</p>
diff --git a/client/src/components/Intro/index.tsx b/client/src/components/Intro/index.tsx
index ccb417fcef9..72c1000a6f6 100644
--- a/client/src/components/Intro/index.tsx
+++ b/client/src/components/Intro/index.tsx
@@ -44,7 +44,7 @@ const Intro = ({
     return (
       <>
         <Spacer size='medium' />
-        <h1 className='text-center'>
+        <h1 id='content-start' className='text-center'>
           {name
             ? `${t('learn.welcome-1', { name: name })}`
             : `${t('learn.welcome-2')}`}
@@ -82,7 +82,9 @@ const Intro = ({
     return (
       <>
         <Spacer size='medium' />
-        <h1 className='text-center'>{t('learn.heading')}</h1>
+        <h1 id='content-start' className='text-center'>
+          {t('learn.heading')}
+        </h1>
         <Spacer size='medium' />
         <IntroDescription />
         <Spacer size='medium' />
diff --git a/client/src/components/landing/components/landing-top.tsx b/client/src/components/landing/components/landing-top.tsx
index de67413b2f7..7dd835ecc1d 100644
--- a/client/src/components/landing/components/landing-top.tsx
+++ b/client/src/components/landing/components/landing-top.tsx
@@ -25,7 +25,11 @@ function LandingTop(): JSX.Element {
       <Row>
         <Spacer size='medium' />
         <Col lg={8} lgOffset={2} sm={10} smOffset={1} xs={12}>
-          <h1 className='big-heading' data-test-label='landing-header'>
+          <h1
+            id='content-start'
+            className='big-heading'
+            data-test-label='landing-header'
+          >
             {t('landing.big-heading-1')}
           </h1>
           <p className='big-heading'>{t('landing.big-heading-2')}</p>
diff --git a/client/src/components/layouts/default.tsx b/client/src/components/layouts/default.tsx
index 4f6e89a631b..70e7af27010 100644
--- a/client/src/components/layouts/default.tsx
+++ b/client/src/components/layouts/default.tsx
@@ -253,9 +253,7 @@ function DefaultLayout({
               />
             </div>
           )}
-          <div id='content-start' tabIndex={-1}>
-            {fetchState.complete && children}
-          </div>
+          {fetchState.complete && children}
         </div>
         {showFooter && <Footer />}
       </div>
diff --git a/client/src/components/layouts/global.css b/client/src/components/layouts/global.css
index 6abb1aae16f..a6de5b2a537 100644
--- a/client/src/components/layouts/global.css
+++ b/client/src/components/layouts/global.css
@@ -1,7 +1,12 @@
+:root {
+  --header-height: 38px;
+}
+
 html {
   height: 100%;
   font-size: 18px;
   -webkit-font-smoothing: antialiased;
+  scroll-padding-top: calc(var(--header-height) + 10px);
 }
 
 body {
@@ -9,7 +14,6 @@ body {
   font-family: var(--font-family-sans-serif);
   color: var(--secondary-color);
   background: var(--secondary-background);
-  --header-height: 38px;
 }
 
 #___gatsby {
@@ -65,15 +69,6 @@ body {
   min-height: 0;
 }
 
-#content-start {
-  min-height: 0;
-  height: 100%;
-}
-
-#content-start > div {
-  height: 100%;
-}
-
 h1 {
   color: var(--secondary-color);
   font-weight: 700;
diff --git a/client/src/components/layouts/learn.css b/client/src/components/layouts/learn.css
index b413fb7fe36..051f1ba1267 100644
--- a/client/src/components/layouts/learn.css
+++ b/client/src/components/layouts/learn.css
@@ -1,3 +1,8 @@
+#content-start {
+  min-height: 0;
+  height: 100%;
+}
+
 #learn-app-wrapper,
 #learn-app-wrapper .desktop-layout,
 #learn-app-wrapper .reflex-container.vertical {
diff --git a/client/src/pages/blocked.tsx b/client/src/pages/blocked.tsx
index 9e2c66f3b7f..3c64559aa23 100644
--- a/client/src/pages/blocked.tsx
+++ b/client/src/pages/blocked.tsx
@@ -12,7 +12,7 @@ function BlockedPage(): JSX.Element {
         <Spacer size='large' />
         <Row>
           <Col lg={8} lgOffset={2} sm={10} smOffset={1} xs={12}>
-            <h1>We can&apos;t log you in.</h1>
+            <h1 id='content-start'>We can&apos;t log you in.</h1>
             <Spacer size='large' />
             <Col lg={10} lgOffset={1} sm={10} smOffset={1} xs={12}>
               <div className='text-left blocked-body'>
diff --git a/client/src/templates/Challenges/components/hotkeys.tsx b/client/src/templates/Challenges/components/hotkeys.tsx
index 9e12e7ba157..e82a80c4532 100644
--- a/client/src/templates/Challenges/components/hotkeys.tsx
+++ b/client/src/templates/Challenges/components/hotkeys.tsx
@@ -174,6 +174,7 @@ function Hotkeys({
   return (
     <>
       <HotKeys
+        id='content-start'
         allowChanges={true}
         handlers={handlers}
         innerRef={innerRef}
diff --git a/client/src/templates/Introduction/components/super-block-intro.tsx b/client/src/templates/Introduction/components/super-block-intro.tsx
index 9b6a29b1a1a..d3b73e45491 100644
--- a/client/src/templates/Introduction/components/super-block-intro.tsx
+++ b/client/src/templates/Introduction/components/super-block-intro.tsx
@@ -25,7 +25,9 @@ function SuperBlockIntro(props: SuperBlockIntroProps): JSX.Element {
 
   return (
     <>
-      <h1 className='text-center big-heading'>{i18nSuperBlock}</h1>
+      <h1 id='content-start' className='text-center big-heading'>
+        {i18nSuperBlock}
+      </h1>
       <Spacer size='medium' />
       {generateIconComponent(superBlock, 'cert-header-icon')}
       <Spacer size='medium' />