diff --git a/src/components/MDXComponents/MDXHeading.tsx b/src/components/MDXComponents/MDXHeading.tsx
index b90b6a627a6..d0b183e6648 100644
--- a/src/components/MDXComponents/MDXHeading.tsx
+++ b/src/components/MDXComponents/MDXHeading.tsx
@@ -5,7 +5,7 @@ export const MDXHeading = (props) => {
   const { level, children, id } = props;
 
   return (
-    <Heading level={level} id={id}>
+    <Heading level={level} id={id} tabIndex={-1}>
       {/* Only output heading links for h2 and h3 \ */}
       {level == 2 || level == 3 ? (
         <Link href={`#${id}`}>{children}</Link>
diff --git a/src/components/MDXComponents/__tests__/MDXHeading.test.tsx b/src/components/MDXComponents/__tests__/MDXHeading.test.tsx
index dbbf05fdae5..5b9315c818c 100644
--- a/src/components/MDXComponents/__tests__/MDXHeading.test.tsx
+++ b/src/components/MDXComponents/__tests__/MDXHeading.test.tsx
@@ -1,5 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { MDXHeading } from '../MDXHeading';
+import { TableOfContents } from '../../TableOfContents/index';
+import userEvent from '@testing-library/user-event';
 
 describe('MDXHeading', () => {
   it('should render H2 with string and anchor link', () => {
@@ -53,4 +55,28 @@ describe('MDXHeading', () => {
     expect(heading).toHaveTextContent(props.children);
     expect(link).not.toBeInTheDocument();
   });
+
+  it('should shift focus to in-content heading on TOC click', async () => {
+    const props = {
+      level: 2,
+      children: 'Test heading',
+      id: 'test-heading'
+    };
+    render(<MDXHeading {...props} />);
+
+    const heading = screen.queryByRole('heading', { level: 2 });
+    const tocHeadings = [
+      { linkText: 'Test heading', hash: 'test-heading', level: 'h2' }
+    ];
+
+    const tableOfContents = <TableOfContents headers={tocHeadings} />;
+    render(tableOfContents);
+
+    const tocEntry = await screen.findByRole('heading', {
+      name: 'Test heading'
+    });
+
+    userEvent.click(tocEntry);
+    expect(heading).toHaveFocus();
+  });
 });
diff --git a/src/styles/base.scss b/src/styles/base.scss
index 0a40b20b1c8..acb023dd7cb 100644
--- a/src/styles/base.scss
+++ b/src/styles/base.scss
@@ -187,6 +187,12 @@ ol:not([class]) {
   .amplify-heading--2,
   .amplify-heading--3 {
     scroll-margin-top: 9rem;
+
+    &:focus-visible {
+      transition: none;
+      outline: 2px solid var(--amplify-colors-border-focus);
+      outline-offset: 2px;
+    }
   }
 }