diff --git a/gradle/changelog/tab_index.yaml b/gradle/changelog/tab_index.yaml
new file mode 100644
index 0000000000..c1b3820d4d
--- /dev/null
+++ b/gradle/changelog/tab_index.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Fix tab order for primary navigation
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index 04627cd308..869b3d1566 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -70974,7 +70974,6 @@ exports[`Storyshots Repositories/RepositoryEntry Archived 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71100,7 +71099,6 @@ exports[`Storyshots Repositories/RepositoryEntry Avatar EP 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71229,7 +71227,6 @@ exports[`Storyshots Repositories/RepositoryEntry Before Title EP 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71355,7 +71352,6 @@ exports[`Storyshots Repositories/RepositoryEntry Default 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71494,7 +71490,6 @@ exports[`Storyshots Repositories/RepositoryEntry Exporting 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71634,7 +71629,6 @@ exports[`Storyshots Repositories/RepositoryEntry HealthCheck Failure 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71785,7 +71779,6 @@ exports[`Storyshots Repositories/RepositoryEntry MultiRepositoryTags 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -71925,7 +71918,6 @@ exports[`Storyshots Repositories/RepositoryEntry RepositoryFlag EP 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
@@ -72051,7 +72043,6 @@ exports[`Storyshots Repositories/RepositoryEntry With long texts 1`] = `
             <a
               className="RepositoryEntry__ContactActionWrapper-sc-6jys82-3 gtjNed is-size-5"
               href="mailto:heart-of-gold@hitchhiker.com"
-              tabIndex={1}
               target="_blank"
               title="overview.contact"
             >
diff --git a/scm-ui/ui-components/src/repos/RepositoryEntry.tsx b/scm-ui/ui-components/src/repos/RepositoryEntry.tsx
index 778b0a9c47..7ffb427e9d 100644
--- a/scm-ui/ui-components/src/repos/RepositoryEntry.tsx
+++ b/scm-ui/ui-components/src/repos/RepositoryEntry.tsx
@@ -121,7 +121,6 @@ const RepositoryEntry: FC<Props> = ({ repository, baseDate }) => {
             target="_blank"
             className={"is-size-5"}
             title={t("overview.contact", { contact: repository.contact })}
-            tabIndex={1}
           >
             {renderContactIcon()}
           </ContactActionWrapper>
diff --git a/scm-ui/ui-webapp/src/components/HeaderDropDown.tsx b/scm-ui/ui-webapp/src/components/HeaderDropDown.tsx
index d4ab2a4ec2..552bdcc8b5 100644
--- a/scm-ui/ui-webapp/src/components/HeaderDropDown.tsx
+++ b/scm-ui/ui-webapp/src/components/HeaderDropDown.tsx
@@ -193,6 +193,7 @@ const HeaderDropDown: FC<Props> = ({ className, icon, count, error, isLoading, m
           className
         )}
         onClick={e => e.stopPropagation()}
+        tabIndex={0}
       >
         <DropDownTrigger
           className={classNames("is-flex", "dropdown-trigger", "is-clickable")}
diff --git a/scm-ui/ui-webapp/src/containers/NavigationBar.tsx b/scm-ui/ui-webapp/src/containers/NavigationBar.tsx
index d64ec6498d..5c0be5718c 100644
--- a/scm-ui/ui-webapp/src/containers/NavigationBar.tsx
+++ b/scm-ui/ui-webapp/src/containers/NavigationBar.tsx
@@ -133,15 +133,15 @@ const NavigationBar: FC<Props> = ({ links }) => {
             <span aria-hidden="true" />
           </button>
         </div>
-        <div className="is-active navbar-header-actions">
-          <Alerts className="navbar-item" />
-          <OmniSearch links={links} />
-          <Notifications className="navbar-item" />
-        </div>
         <StyledMenuBar className={classNames("navbar-menu", { "is-active": burgerActive })}>
           <div className="navbar-start">
             <PrimaryNavigation links={links} />
           </div>
+          <div className="is-active navbar-header-actions">
+            <Alerts className="navbar-item" />
+            <OmniSearch links={links} />
+            <Notifications className="navbar-item" />
+          </div>
           <div className="navbar-end">
             <LogoutButton burgerMode={burgerActive} links={links} />
             <LoginButton burgerMode={burgerActive} links={links} />