diff --git a/static/app/components/hovercard.tsx b/static/app/components/hovercard.tsx
index b360ee6f481222..5105af1d840ba4 100644
--- a/static/app/components/hovercard.tsx
+++ b/static/app/components/hovercard.tsx
@@ -1,7 +1,8 @@
-import {Fragment, useCallback, useRef} from 'react';
+import {createContext, Fragment, useCallback, useContext, useMemo, useRef} from 'react';
 import {createPortal} from 'react-dom';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
+import type {State} from '@popperjs/core';
 import {useResizeObserver} from '@react-aria/utils';
 import {AnimatePresence} from 'framer-motion';
 
@@ -16,6 +17,10 @@ interface HovercardProps extends Omit<UseHoverOverlayProps, 'isHoverable'> {
    * Classname to apply to the hovercard
    */
   children: React.ReactNode;
+  /**
+   * Whether to animate the hovercard in/out
+   */
+  animated?: boolean;
   /**
    * Element to display in the body
    */
@@ -32,6 +37,11 @@ interface HovercardProps extends Omit<UseHoverOverlayProps, 'isHoverable'> {
    * Element to display in the header
    */
   header?: React.ReactNode;
+  /**
+   * Container to render the hovercard content
+   * Defaults to document.body
+   */
+  portalContainer?: HTMLElement;
   /**
    * Color of the arrow tip border
    */
@@ -47,11 +57,33 @@ type UseOverOverlayState = ReturnType<typeof useHoverOverlay>;
 interface HovercardContentProps
   extends Pick<
     HovercardProps,
-    'bodyClassName' | 'className' | 'header' | 'body' | 'tipColor' | 'tipBorderColor'
+    | 'animated'
+    | 'bodyClassName'
+    | 'className'
+    | 'header'
+    | 'body'
+    | 'tipColor'
+    | 'tipBorderColor'
   > {
   hoverOverlayState: Omit<UseOverOverlayState, 'isOpen' | 'wrapTrigger'>;
 }
 
+interface HovercardProviderValue {
+  isOpen: boolean;
+  reset: () => void;
+  update: (() => Promise<Partial<State>>) | null;
+}
+
+const HovercardContext = createContext<HovercardProviderValue>({
+  isOpen: false,
+  reset: () => {},
+  update: null,
+});
+
+export function useHovercardContext() {
+  return useContext(HovercardContext);
+}
+
 function useUpdateOverlayPositionOnContentChange({
   update,
 }: Pick<UseOverOverlayState, 'update'>) {
@@ -70,6 +102,7 @@ function useUpdateOverlayPositionOnContentChange({
 }
 
 function HovercardContent({
+  animated,
   body,
   bodyClassName,
   className,
@@ -84,7 +117,7 @@ function HovercardContent({
   return (
     <PositionWrapper zIndex={theme.zIndex.hovercard} {...overlayProps}>
       <StyledHovercard
-        animated
+        animated={animated}
         arrowProps={{
           ...arrowProps,
           size: 20,
@@ -114,6 +147,8 @@ function Hovercard({
   displayTimeout = 100,
   tipBorderColor = 'translucentBorder',
   tipColor = 'backgroundElevated',
+  animated = true,
+  portalContainer = document.body,
   ...hoverOverlayProps
 }: HovercardProps): React.ReactElement {
   const {wrapTrigger, isOpen, ...hoverOverlayState} = useHoverOverlay({
@@ -124,6 +159,14 @@ function Hovercard({
     ...hoverOverlayProps,
   });
 
+  const contextValue = useMemo<HovercardProviderValue>(
+    () => ({
+      isOpen,
+      reset: hoverOverlayState.reset,
+      update: hoverOverlayState.update,
+    }),
+    [isOpen, hoverOverlayState.reset, hoverOverlayState.update]
+  );
   // Nothing to render if no header or body. Be consistent with wrapping the
   // children with the trigger in the case that the body / header is set while
   // the trigger is hovered.
@@ -131,9 +174,10 @@ function Hovercard({
     return <Fragment>{wrapTrigger(children)}</Fragment>;
   }
 
-  const hovercardContent = isOpen && (
+  const hovercardContent = isOpen ? (
     <HovercardContent
       {...{
+        animated,
         body,
         bodyClassName,
         className,
@@ -143,13 +187,19 @@ function Hovercard({
         hoverOverlayState,
       }}
     />
+  ) : null;
+
+  const hovercard = animated ? (
+    <AnimatePresence>{hovercardContent}</AnimatePresence>
+  ) : (
+    hovercardContent
   );
 
   return (
-    <Fragment>
+    <HovercardContext.Provider value={contextValue}>
       {wrapTrigger(children)}
-      {createPortal(<AnimatePresence>{hovercardContent}</AnimatePresence>, document.body)}
-    </Fragment>
+      {createPortal(hovercard, portalContainer)}
+    </HovercardContext.Provider>
   );
 }
 
diff --git a/static/app/views/admin/adminLayout.tsx b/static/app/views/admin/adminLayout.tsx
index 523c7f2826a556..9805234d9b099b 100644
--- a/static/app/views/admin/adminLayout.tsx
+++ b/static/app/views/admin/adminLayout.tsx
@@ -5,6 +5,7 @@ import {t} from 'sentry/locale';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import useOrganization from 'sentry/utils/useOrganization';
 import {prefersStackedNav} from 'sentry/views/nav/prefersStackedNav';
+import {PrimaryNavGroup} from 'sentry/views/nav/types';
 import {BreadcrumbProvider} from 'sentry/views/settings/components/settingsBreadcrumb/context';
 import SettingsLayout from 'sentry/views/settings/components/settingsLayout';
 import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
@@ -40,6 +41,7 @@ export function AdminNavigation() {
           ],
         },
       ]}
+      primaryNavGroup={PrimaryNavGroup.ADMIN}
     />
   );
 }
diff --git a/static/app/views/nav/index.spec.tsx b/static/app/views/nav/index.spec.tsx
index 2c4d165e44544b..89157eb4026cdf 100644
--- a/static/app/views/nav/index.spec.tsx
+++ b/static/app/views/nav/index.spec.tsx
@@ -78,6 +78,16 @@ describe('Nav', function () {
       body: {},
     });
 
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/explore/saved/`,
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/dashboards/`,
+      body: [],
+    });
+
     ConfigStore.set('user', {
       ...ConfigStore.get('user'),
       options: {
@@ -243,13 +253,19 @@ describe('Nav', function () {
 
         await userEvent.click(screen.getByRole('button', {name: 'Collapse'}));
 
-        expect(screen.getByTestId('collapsed-secondary-sidebar')).toBeInTheDocument();
+        await waitFor(() => {
+          expect(
+            screen.queryByRole('navigation', {name: 'Secondary Navigation'})
+          ).not.toBeInTheDocument();
+        });
 
-        await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
+        await userEvent.hover(screen.getByRole('link', {name: 'Issues'}));
 
         expect(
-          screen.queryByTestId('collapsed-secondary-sidebar')
-        ).not.toBeInTheDocument();
+          await screen.findByRole('navigation', {name: 'Secondary Navigation'})
+        ).toBeInTheDocument();
+
+        await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
       });
 
       it('remembers collapsed state', async function () {
@@ -257,44 +273,28 @@ describe('Nav', function () {
 
         renderNav();
 
-        expect(
-          await screen.findByTestId('collapsed-secondary-sidebar')
-        ).toBeInTheDocument();
-        expect(screen.getByRole('button', {name: 'Expand'})).toBeInTheDocument();
+        await waitFor(() => {
+          expect(
+            screen.queryByRole('navigation', {name: 'Secondary Navigation'})
+          ).not.toBeInTheDocument();
+        });
       });
 
-      it('expands on hover', async function () {
+      it('closes secondary nav overlay when navigating to a new route', async function () {
         localStorage.setItem(NAV_SIDEBAR_COLLAPSED_LOCAL_STORAGE_KEY, 'true');
 
         renderNav();
 
-        expect(
-          await screen.findByTestId('collapsed-secondary-sidebar')
-        ).toBeInTheDocument();
+        await userEvent.hover(screen.getByRole('link', {name: 'Explore'}));
 
-        expect(screen.getByTestId('collapsed-secondary-sidebar')).toHaveAttribute(
-          'data-visible',
-          'false'
-        );
+        await screen.findByRole('navigation', {name: 'Secondary Navigation'});
 
-        // Moving pointer over the primary navigation should expand the sidebar
-        await userEvent.hover(
-          screen.getByRole('navigation', {name: 'Primary Navigation'})
-        );
-        expect(screen.getByTestId('collapsed-secondary-sidebar')).toHaveAttribute(
-          'data-visible',
-          'true'
-        );
+        await userEvent.click(screen.getByRole('link', {name: 'Traces'}));
 
-        // Moving pointer away should hide the sidebar
-        await userEvent.unhover(
-          screen.getByRole('navigation', {name: 'Primary Navigation'})
-        );
         await waitFor(() => {
-          expect(screen.getByTestId('collapsed-secondary-sidebar')).toHaveAttribute(
-            'data-visible',
-            'false'
-          );
+          expect(
+            screen.queryByRole('navigation', {name: 'Secondary Navigation'})
+          ).not.toBeInTheDocument();
         });
       });
     });
diff --git a/static/app/views/nav/index.tsx b/static/app/views/nav/index.tsx
index 78f995f2a4a439..aaf44ea0fab169 100644
--- a/static/app/views/nav/index.tsx
+++ b/static/app/views/nav/index.tsx
@@ -4,6 +4,7 @@ import styled from '@emotion/styled';
 
 import {useNavContext} from 'sentry/views/nav/context';
 import MobileTopbar from 'sentry/views/nav/mobileTopbar';
+import {SecondaryNav} from 'sentry/views/nav/secondary/secondary';
 import {SecondaryNavContent} from 'sentry/views/nav/secondary/secondaryNavContent';
 import {Sidebar} from 'sentry/views/nav/sidebar';
 import {
@@ -11,11 +12,13 @@ import {
   useStackedNavigationTour,
 } from 'sentry/views/nav/tour/tour';
 import {NavLayout} from 'sentry/views/nav/types';
+import {useActiveNavGroup} from 'sentry/views/nav/useActiveNavGroup';
 
 function NavContent() {
   const {layout, navParentRef} = useNavContext();
   const {currentStepId, endTour} = useStackedNavigationTour();
   const tourIsActive = currentStepId !== null;
+  const activeNavGroup = useActiveNavGroup();
 
   // The tour only works with the sidebar layout, so if we change to the mobile
   // layout in the middle of the tour, it needs to end.
@@ -32,7 +35,9 @@ function NavContent() {
       isMobile={layout === NavLayout.MOBILE}
     >
       {layout === NavLayout.SIDEBAR ? <Sidebar /> : <MobileTopbar />}
-      <SecondaryNavContent />
+      <SecondaryNav>
+        <SecondaryNavContent group={activeNavGroup} />
+      </SecondaryNav>
     </NavContainer>
   );
 }
diff --git a/static/app/views/nav/primary/components.tsx b/static/app/views/nav/primary/components.tsx
index 21297a7949ce8b..adeb2e56a073c2 100644
--- a/static/app/views/nav/primary/components.tsx
+++ b/static/app/views/nav/primary/components.tsx
@@ -1,10 +1,12 @@
 import {Fragment, type MouseEventHandler} from 'react';
-import {css, type Theme, useTheme} from '@emotion/react';
+import type {Theme} from '@emotion/react';
+import {css, useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/core/button';
 import {Tooltip} from 'sentry/components/core/tooltip';
 import {DropdownMenu, type MenuItemProps} from 'sentry/components/dropdownMenu';
+import {useHovercardContext} from 'sentry/components/hovercard';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import Link, {linkStyles} from 'sentry/components/links/link';
 import {SIDEBAR_NAVIGATION_SOURCE} from 'sentry/components/sidebar/utils';
@@ -19,12 +21,15 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {PRIMARY_SIDEBAR_WIDTH} from 'sentry/views/nav/constants';
 import {useNavContext} from 'sentry/views/nav/context';
+import {PRIMARY_NAV_GROUP_CONFIG} from 'sentry/views/nav/primary/config';
+import {SecondaryHovercard} from 'sentry/views/nav/primary/secondaryHovercard';
+import type {PrimaryNavGroup} from 'sentry/views/nav/types';
 import {NavLayout} from 'sentry/views/nav/types';
 import {isLinkActive} from 'sentry/views/nav/utils';
 
 interface SidebarItemLinkProps {
   analyticsKey: string;
-  label: string;
+  group: PrimaryNavGroup;
   to: string;
   activeTo?: string;
   children?: React.ReactNode;
@@ -135,42 +140,72 @@ export function SidebarMenu({
   );
 }
 
-export function SidebarLink({
+function SidebarNavLink({
   children,
   to,
   activeTo = to,
   analyticsKey,
-  label,
+  group,
 }: SidebarItemLinkProps) {
-  const theme = useTheme();
   const organization = useOrganization();
+  const {reset: closeCollapsedNavHovercard} = useHovercardContext();
+  const {layout} = useNavContext();
+  const theme = useTheme();
   const location = useLocation();
   const isActive = isLinkActive(normalizeUrl(activeTo, location), location.pathname);
-  const {layout} = useNavContext();
+  const label = PRIMARY_NAV_GROUP_CONFIG[group].label;
+
+  return (
+    <NavLink
+      to={to}
+      state={{source: SIDEBAR_NAVIGATION_SOURCE}}
+      onClick={() => {
+        recordPrimaryItemClick(analyticsKey, organization);
+
+        // When the nav is collapsed, clicking on a link will close the hovercard.
+        closeCollapsedNavHovercard();
+      }}
+      aria-selected={isActive}
+      aria-current={isActive ? 'page' : undefined}
+      isMobile={layout === NavLayout.MOBILE}
+    >
+      {layout === NavLayout.MOBILE ? (
+        <Fragment>
+          {theme.isChonk ? null : <InteractionStateLayer />}
+          {children}
+          {label}
+        </Fragment>
+      ) : (
+        <Fragment>
+          <NavLinkIconContainer>{children}</NavLinkIconContainer>
+          <NavLinkLabel>{label}</NavLinkLabel>
+        </Fragment>
+      )}
+    </NavLink>
+  );
+}
+
+export function SidebarLink({
+  children,
+  to,
+  activeTo = to,
+  analyticsKey,
+  group,
+}: SidebarItemLinkProps) {
+  const label = PRIMARY_NAV_GROUP_CONFIG[group].label;
 
   return (
     <SidebarItem label={label} showLabel>
-      <NavLink
-        to={to}
-        state={{source: SIDEBAR_NAVIGATION_SOURCE}}
-        onClick={() => recordPrimaryItemClick(analyticsKey, organization)}
-        aria-selected={isActive}
-        aria-current={isActive ? 'page' : undefined}
-        isMobile={layout === NavLayout.MOBILE}
-      >
-        {layout === NavLayout.MOBILE ? (
-          <Fragment>
-            {theme.isChonk ? null : <InteractionStateLayer />}
-            {children}
-            {label}
-          </Fragment>
-        ) : (
-          <Fragment>
-            <NavLinkIconContainer>{children}</NavLinkIconContainer>
-            <NavLinkLabel>{label}</NavLinkLabel>
-          </Fragment>
-        )}
-      </NavLink>
+      <SecondaryHovercard group={group}>
+        <SidebarNavLink
+          to={to}
+          activeTo={activeTo}
+          analyticsKey={analyticsKey}
+          group={group}
+        >
+          {children}
+        </SidebarNavLink>
+      </SecondaryHovercard>
     </SidebarItem>
   );
 }
diff --git a/static/app/views/nav/primary/index.tsx b/static/app/views/nav/primary/index.tsx
index c6ee454353b180..e0f3c15bacf56e 100644
--- a/static/app/views/nav/primary/index.tsx
+++ b/static/app/views/nav/primary/index.tsx
@@ -22,7 +22,6 @@ import {
   SidebarLink,
   SidebarList,
 } from 'sentry/views/nav/primary/components';
-import {PRIMARY_NAV_GROUP_CONFIG} from 'sentry/views/nav/primary/config';
 import {PrimaryNavigationHelp} from 'sentry/views/nav/primary/help';
 import {PrimaryNavigationOnboarding} from 'sentry/views/nav/primary/onboarding';
 import {PrimaryNavigationServiceIncidents} from 'sentry/views/nav/primary/serviceIncidents';
@@ -61,7 +60,7 @@ export function PrimaryNavigationItems() {
           <SidebarLink
             to={`/${prefix}/issues/`}
             analyticsKey="issues"
-            label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.ISSUES].label}
+            group={PrimaryNavGroup.ISSUES}
           >
             <IconIssues />
           </SidebarLink>
@@ -76,7 +75,7 @@ export function PrimaryNavigationItems() {
             to={`/${prefix}/explore/${getDefaultExploreRoute(organization)}/`}
             activeTo={`/${prefix}/explore`}
             analyticsKey="explore"
-            label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.EXPLORE].label}
+            group={PrimaryNavGroup.EXPLORE}
           >
             <IconSearch />
           </SidebarLink>
@@ -96,7 +95,7 @@ export function PrimaryNavigationItems() {
               to={`/${prefix}/dashboards/`}
               activeTo={`/${prefix}/dashboard`}
               analyticsKey="dashboards"
-              label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.DASHBOARDS].label}
+              group={PrimaryNavGroup.DASHBOARDS}
             >
               <IconDashboard />
             </SidebarLink>
@@ -113,7 +112,7 @@ export function PrimaryNavigationItems() {
               to={`/${prefix}/insights/frontend/`}
               activeTo={`/${prefix}/insights`}
               analyticsKey="insights"
-              label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.INSIGHTS].label}
+              group={PrimaryNavGroup.INSIGHTS}
             >
               <IconGraph type="area" />
             </SidebarLink>
@@ -125,7 +124,7 @@ export function PrimaryNavigationItems() {
             to={`/${prefix}/${CODECOV_BASE_URL}/${COVERAGE_BASE_URL}/commits/`}
             activeTo={`/${prefix}/${CODECOV_BASE_URL}/`}
             analyticsKey="codecov"
-            label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.CODECOV].label}
+            group={PrimaryNavGroup.CODECOV}
           >
             <IconCodecov />
           </SidebarLink>
@@ -142,7 +141,7 @@ export function PrimaryNavigationItems() {
             to={`/settings/${organization.slug}/`}
             activeTo={`/settings/`}
             analyticsKey="settings"
-            label={PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.SETTINGS].label}
+            group={PrimaryNavGroup.SETTINGS}
           >
             <IconSettings />
           </SidebarLink>
diff --git a/static/app/views/nav/primary/secondaryHovercard.tsx b/static/app/views/nav/primary/secondaryHovercard.tsx
new file mode 100644
index 00000000000000..6715b3a3112023
--- /dev/null
+++ b/static/app/views/nav/primary/secondaryHovercard.tsx
@@ -0,0 +1,57 @@
+import {ClassNames} from '@emotion/react';
+import styled from '@emotion/styled';
+
+import {Hovercard} from 'sentry/components/hovercard';
+import {IconDefaultsProvider} from 'sentry/icons/useIconDefaults';
+import {useNavContext} from 'sentry/views/nav/context';
+import {SecondaryNavContent} from 'sentry/views/nav/secondary/secondaryNavContent';
+import type {PrimaryNavGroup} from 'sentry/views/nav/types';
+import {NavLayout} from 'sentry/views/nav/types';
+
+interface SecondaryHovercardProps {
+  children: React.ReactNode;
+  group: PrimaryNavGroup;
+}
+
+export function SecondaryHovercard({children, group}: SecondaryHovercardProps) {
+  const {layout, isCollapsed, navParentRef} = useNavContext();
+
+  if (layout !== NavLayout.SIDEBAR || !isCollapsed) {
+    return children;
+  }
+
+  return (
+    <ClassNames>
+      {({css}) => (
+        <Hovercard
+          body={
+            <IconDefaultsProvider>
+              <SecondaryBody role="navigation" aria-label="Secondary Navigation">
+                <SecondaryNavContent group={group} />
+              </SecondaryBody>
+            </IconDefaultsProvider>
+          }
+          position="right-start"
+          animated={false}
+          delay={50}
+          displayTimeout={50}
+          bodyClassName={css`
+            padding: 0;
+            max-height: 80vh;
+            display: grid;
+            grid-template-rows: auto 1fr auto;
+          `}
+          containerDisplayMode="block"
+          offset={0}
+          portalContainer={navParentRef.current ?? undefined}
+        >
+          {children}
+        </Hovercard>
+      )}
+    </ClassNames>
+  );
+}
+
+const SecondaryBody = styled('div')`
+  display: contents;
+`;
diff --git a/static/app/views/nav/secondary/secondary.tsx b/static/app/views/nav/secondary/secondary.tsx
index 21631d192e28cb..5c0cf521500652 100644
--- a/static/app/views/nav/secondary/secondary.tsx
+++ b/static/app/views/nav/secondary/secondary.tsx
@@ -6,6 +6,7 @@ import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/core/button';
+import {useHovercardContext} from 'sentry/components/hovercard';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import Link, {type LinkProps} from 'sentry/components/links/link';
 import {SIDEBAR_NAVIGATION_SOURCE} from 'sentry/components/sidebar/utils';
@@ -19,9 +20,7 @@ import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useNavContext} from 'sentry/views/nav/context';
-import {PRIMARY_NAV_GROUP_CONFIG} from 'sentry/views/nav/primary/config';
 import {NavLayout} from 'sentry/views/nav/types';
-import {useActiveNavGroup} from 'sentry/views/nav/useActiveNavGroup';
 import {isLinkActive} from 'sentry/views/nav/utils';
 
 type SecondaryNavProps = {
@@ -59,7 +58,6 @@ export function SecondaryNav({children}: SecondaryNavProps) {
 
 SecondaryNav.Header = function SecondaryNavHeader({children}: {children?: ReactNode}) {
   const {isCollapsed, setIsCollapsed, layout} = useNavContext();
-  const group = useActiveNavGroup();
 
   if (layout === NavLayout.MOBILE) {
     return null;
@@ -67,7 +65,7 @@ SecondaryNav.Header = function SecondaryNavHeader({children}: {children?: ReactN
 
   return (
     <Header>
-      <div>{children ?? PRIMARY_NAV_GROUP_CONFIG[group].label}</div>
+      <div>{children}</div>
       <div>
         <Button
           borderless
@@ -202,6 +200,7 @@ SecondaryNav.Item = function SecondaryNavItem({
   const isActive = incomingIsActive ?? isLinkActive(activeTo, location.pathname, {end});
 
   const {layout} = useNavContext();
+  const {reset: closeCollapsedNavHovercard} = useHovercardContext();
 
   return (
     <Item
@@ -218,6 +217,10 @@ SecondaryNav.Item = function SecondaryNavItem({
             organization,
           });
         }
+
+        // When this is rendered inside a hovercard (when the nav is collapsed)
+        // this will dismiss it when clicking on a link.
+        closeCollapsedNavHovercard();
       }}
     >
       {leadingItems}
@@ -254,6 +257,7 @@ const Header = styled('div')`
 
 const Body = styled('div')<{layout: NavLayout}>`
   overflow-y: auto;
+  overscroll-behavior: contain;
 
   ${p =>
     p.layout === NavLayout.MOBILE &&
diff --git a/static/app/views/nav/secondary/secondaryNavContent.tsx b/static/app/views/nav/secondary/secondaryNavContent.tsx
index 39a7aa610af21f..b6681445b0c1af 100644
--- a/static/app/views/nav/secondary/secondaryNavContent.tsx
+++ b/static/app/views/nav/secondary/secondaryNavContent.tsx
@@ -9,12 +9,9 @@ import {InsightsSecondaryNav} from 'sentry/views/nav/secondary/sections/insights
 import {IssuesSecondaryNav} from 'sentry/views/nav/secondary/sections/issues/issuesSecondaryNav';
 import {SettingsSecondaryNav} from 'sentry/views/nav/secondary/sections/settings/settingsSecondaryNav';
 import {PrimaryNavGroup} from 'sentry/views/nav/types';
-import {useActiveNavGroup} from 'sentry/views/nav/useActiveNavGroup';
 
-export function SecondaryNavContent(): ReactNode {
-  const activeNavGroup = useActiveNavGroup();
-
-  switch (activeNavGroup) {
+export function SecondaryNavContent({group}: {group: PrimaryNavGroup}): ReactNode {
+  switch (group) {
     case PrimaryNavGroup.ISSUES:
       return <IssuesSecondaryNav />;
     case PrimaryNavGroup.INSIGHTS:
@@ -30,7 +27,7 @@ export function SecondaryNavContent(): ReactNode {
     case PrimaryNavGroup.ADMIN:
       return <AdminSecondaryNav />;
     default:
-      unreachable(activeNavGroup);
+      unreachable(group);
       return null;
   }
 }
diff --git a/static/app/views/nav/secondary/sections/codecov/codecovSecondaryNav.tsx b/static/app/views/nav/secondary/sections/codecov/codecovSecondaryNav.tsx
index c7e3884d30fbfb..d0f0c5daf7d880 100644
--- a/static/app/views/nav/secondary/sections/codecov/codecovSecondaryNav.tsx
+++ b/static/app/views/nav/secondary/sections/codecov/codecovSecondaryNav.tsx
@@ -1,3 +1,5 @@
+import {Fragment} from 'react';
+
 import {t} from 'sentry/locale';
 import useOrganization from 'sentry/utils/useOrganization';
 import {makeCodecovPathname} from 'sentry/views/codecov/pathnames';
@@ -26,7 +28,7 @@ function CodecovSecondaryNav() {
   });
 
   return (
-    <SecondaryNav>
+    <Fragment>
       <SecondaryNav.Header>
         {PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.CODECOV].label}
       </SecondaryNav.Header>
@@ -48,7 +50,7 @@ function CodecovSecondaryNav() {
           </SecondaryNav.Item>
         </SecondaryNav.Section>
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
 
diff --git a/static/app/views/nav/secondary/sections/dashboards/dashboardsSecondaryNav.tsx b/static/app/views/nav/secondary/sections/dashboards/dashboardsSecondaryNav.tsx
index 0e4ee90c379f2d..5f460f7467bf8d 100644
--- a/static/app/views/nav/secondary/sections/dashboards/dashboardsSecondaryNav.tsx
+++ b/static/app/views/nav/secondary/sections/dashboards/dashboardsSecondaryNav.tsx
@@ -1,3 +1,5 @@
+import {Fragment} from 'react';
+
 import {t} from 'sentry/locale';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -25,7 +27,7 @@ export function DashboardsSecondaryNav() {
   );
 
   return (
-    <SecondaryNav>
+    <Fragment>
       <SecondaryNav.Header>
         {PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.DASHBOARDS].label}
       </SecondaryNav.Header>
@@ -49,6 +51,6 @@ export function DashboardsSecondaryNav() {
           </SecondaryNav.Section>
         ) : null}
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
diff --git a/static/app/views/nav/secondary/sections/explore/exploreSecondaryNav.tsx b/static/app/views/nav/secondary/sections/explore/exploreSecondaryNav.tsx
index 07c614cdb0906d..113b75357704d6 100644
--- a/static/app/views/nav/secondary/sections/explore/exploreSecondaryNav.tsx
+++ b/static/app/views/nav/secondary/sections/explore/exploreSecondaryNav.tsx
@@ -1,3 +1,5 @@
+import {Fragment} from 'react';
+
 import Feature from 'sentry/components/acl/feature';
 import {FeatureBadge} from 'sentry/components/core/badge/featureBadge';
 import {t} from 'sentry/locale';
@@ -28,7 +30,7 @@ export function ExploreSecondaryNav() {
   const showOurlogsNew = !localStorage.getItem(ourlogsSeenKey);
 
   return (
-    <SecondaryNav>
+    <Fragment>
       <SecondaryNav.Header>
         {PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.EXPLORE].label}
       </SecondaryNav.Header>
@@ -106,6 +108,6 @@ export function ExploreSecondaryNav() {
           )}
         </Feature>
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
diff --git a/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx b/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx
index d1119cf93bf5a0..6406404ee63550 100644
--- a/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx
+++ b/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx
@@ -1,4 +1,4 @@
-import {useMemo} from 'react';
+import {Fragment, useMemo} from 'react';
 import styled from '@emotion/styled';
 import partition from 'lodash/partition';
 
@@ -64,7 +64,7 @@ export function InsightsSecondaryNav() {
     : nonStarredProjects.filter(project => project.isMember).slice(0, 8);
 
   return (
-    <SecondaryNav>
+    <Fragment>
       <SecondaryNav.Header>
         {PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.INSIGHTS].label}
       </SecondaryNav.Header>
@@ -155,7 +155,7 @@ export function InsightsSecondaryNav() {
           </SecondaryNav.Section>
         ) : null}
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
 
diff --git a/static/app/views/nav/secondary/sections/issues/issuesSecondaryNav.tsx b/static/app/views/nav/secondary/sections/issues/issuesSecondaryNav.tsx
index bfa29b3a5cfaf3..1fb12c63cdda28 100644
--- a/static/app/views/nav/secondary/sections/issues/issuesSecondaryNav.tsx
+++ b/static/app/views/nav/secondary/sections/issues/issuesSecondaryNav.tsx
@@ -1,4 +1,5 @@
 import {Fragment, useRef} from 'react';
+import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {FeatureBadge} from 'sentry/components/core/badge/featureBadge';
@@ -6,10 +7,11 @@ import {useWorkflowEngineFeatureGate} from 'sentry/components/workflowEngine/use
 import {t} from 'sentry/locale';
 import useOrganization from 'sentry/utils/useOrganization';
 import {ISSUE_TAXONOMY_CONFIG} from 'sentry/views/issueList/taxonomies';
+import {useNavContext} from 'sentry/views/nav/context';
 import {PRIMARY_NAV_GROUP_CONFIG} from 'sentry/views/nav/primary/config';
 import {SecondaryNav} from 'sentry/views/nav/secondary/secondary';
 import {IssueViews} from 'sentry/views/nav/secondary/sections/issues/issueViews/issueViews';
-import {PrimaryNavGroup} from 'sentry/views/nav/types';
+import {NavLayout, PrimaryNavGroup} from 'sentry/views/nav/types';
 
 export function IssuesSecondaryNav() {
   const organization = useOrganization();
@@ -19,7 +21,7 @@ export function IssuesSecondaryNav() {
   const hasIssueTaxonomy = organization.features.includes('issue-taxonomy');
 
   return (
-    <SecondaryNav>
+    <Fragment>
       <SecondaryNav.Header>
         {PRIMARY_NAV_GROUP_CONFIG[PrimaryNavGroup.ISSUES].label}
       </SecondaryNav.Header>
@@ -78,14 +80,23 @@ export function IssuesSecondaryNav() {
         <IssueViews sectionRef={sectionRef} />
         <ConfigureSection baseUrl={baseUrl} />
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
 
 function ConfigureSection({baseUrl}: {baseUrl: string}) {
+  const {layout, isCollapsed} = useNavContext();
   const hasWorkflowEngine = useWorkflowEngineFeatureGate();
+
+  const isSticky = layout === NavLayout.SIDEBAR && !isCollapsed;
+
   return (
-    <StickyBottomSection id="issues-configure" title={t('Configure')} collapsible={false}>
+    <StickyBottomSection
+      id="issues-configure"
+      title={t('Configure')}
+      collapsible={false}
+      isSticky={isSticky}
+    >
       {hasWorkflowEngine ? (
         <Fragment>
           <SecondaryNav.Item
@@ -116,8 +127,14 @@ function ConfigureSection({baseUrl}: {baseUrl: string}) {
   );
 }
 
-const StickyBottomSection = styled(SecondaryNav.Section)`
-  position: sticky;
-  bottom: 0;
-  background: ${p => (p.theme.isChonk ? p.theme.background : p.theme.surface200)};
+const StickyBottomSection = styled(SecondaryNav.Section, {
+  shouldForwardProp: prop => prop !== 'isSticky',
+})<{isSticky: boolean}>`
+  ${p =>
+    p.isSticky &&
+    css`
+      position: sticky;
+      bottom: 0;
+      background: ${p.theme.isChonk ? p.theme.background : p.theme.surface200};
+    `}
 `;
diff --git a/static/app/views/nav/sidebar.tsx b/static/app/views/nav/sidebar.tsx
index bd0b22d12a2918..1f24f4563c79f5 100644
--- a/static/app/views/nav/sidebar.tsx
+++ b/static/app/views/nav/sidebar.tsx
@@ -1,7 +1,6 @@
 import {Fragment} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
-import {motion} from 'framer-motion';
 
 import Hook from 'sentry/components/hook';
 import ConfigStore from 'sentry/stores/configStore';
@@ -11,18 +10,16 @@ import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
 import {chonkStyled} from 'sentry/utils/theme/theme.chonk';
 import {withChonk} from 'sentry/utils/theme/withChonk';
 import useOrganization from 'sentry/utils/useOrganization';
-import {PRIMARY_SIDEBAR_WIDTH, SECONDARY_SIDEBAR_WIDTH} from 'sentry/views/nav/constants';
+import {PRIMARY_SIDEBAR_WIDTH} from 'sentry/views/nav/constants';
 import {useNavContext} from 'sentry/views/nav/context';
 import {OrgDropdown} from 'sentry/views/nav/orgDropdown';
 import {PrimaryNavigationItems} from 'sentry/views/nav/primary/index';
 import {SecondarySidebar} from 'sentry/views/nav/secondary/secondarySidebar';
 import {useStackedNavigationTour, useTourModal} from 'sentry/views/nav/tour/tour';
-import {useCollapsedNav} from 'sentry/views/nav/useCollapsedNav';
 
 export function Sidebar() {
   const organization = useOrganization();
   const {isCollapsed: isCollapsedState} = useNavContext();
-  const {isOpen} = useCollapsedNav();
 
   // Avoid showing superuser UI on certain organizations
   const isExcludedOrg = HookStore.get('component:superuser-warning-excluded')[0]?.(
@@ -57,22 +54,6 @@ export function Sidebar() {
         <PrimaryNavigationItems />
       </SidebarWrapper>
       {isCollapsed ? null : <SecondarySidebar />}
-
-      {isCollapsed ? (
-        <CollapsedSecondaryWrapper
-          initial="hidden"
-          animate={isOpen ? 'visible' : 'hidden'}
-          variants={{
-            visible: {x: 0},
-            hidden: {x: -SECONDARY_SIDEBAR_WIDTH - 10},
-          }}
-          transition={{duration: 0.15, ease: 'easeOut'}}
-          data-test-id="collapsed-secondary-sidebar"
-          data-visible={isOpen}
-        >
-          <SecondarySidebar />
-        </CollapsedSecondaryWrapper>
-      ) : null}
     </Fragment>
   );
 }
@@ -93,14 +74,6 @@ const SidebarWrapper = styled('div')<{tourIsActive: boolean}>`
     `}
 `;
 
-const CollapsedSecondaryWrapper = styled(motion.div)`
-  position: absolute;
-  top: 0;
-  left: ${PRIMARY_SIDEBAR_WIDTH}px;
-  height: 100%;
-  box-shadow: ${p => (p.theme.isChonk ? 'none' : p.theme.dropShadowHeavy)};
-`;
-
 const SidebarHeader = styled('header')<{isSuperuser: boolean}>`
   position: relative;
   display: flex;
diff --git a/static/app/views/nav/useCollapsedNav.tsx b/static/app/views/nav/useCollapsedNav.tsx
deleted file mode 100644
index 720e21c9a952e8..00000000000000
--- a/static/app/views/nav/useCollapsedNav.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import {useCallback, useEffect, useRef, useState} from 'react';
-import {useInteractOutside} from '@react-aria/interactions';
-
-import {useNavContext} from 'sentry/views/nav/context';
-
-// Slightly delay closing the nav to prevent accidental dismissal
-const CLOSE_DELAY = 200;
-const IGNORE_ELEMENTS = [
-  // Tooltips are rendered in document.body so will cause the nav to close
-  '[data-tooltip="true"]',
-];
-
-/**
- * Handles logic for deciding when the collpased nav should be visible.
- *
- * Mouse in -> open
- * Mouse out -> close
- * Keyboard focus on elements within nav -> open
- * Menu open within nav -> open
- * Other interactions (such as dragging) -> open
- * Interaction outside nav -> close
- * Escape -> close
- */
-export function useCollapsedNav() {
-  const {navParentRef, isCollapsed, isInteractingRef, endInteraction} = useNavContext();
-
-  const [isOpen, setIsOpen] = useState(false);
-  const isHoveredRef = useRef(false);
-
-  const closeNav = useCallback(() => {
-    isHoveredRef.current = false;
-    endInteraction();
-    setIsOpen(false);
-  }, [endInteraction]);
-
-  const shouldNavStayOpen = useCallback(() => {
-    const hasKeyboardFocus = navParentRef.current?.querySelector(':focus-visible');
-    const hasOpenMenu = navParentRef.current?.querySelector('[aria-expanded="true"]');
-
-    return (
-      isHoveredRef.current || isInteractingRef.current || hasKeyboardFocus || hasOpenMenu
-    );
-  }, [isInteractingRef, navParentRef]);
-
-  const tryCloseNav = useCallback(() => {
-    if (shouldNavStayOpen()) {
-      return;
-    }
-
-    closeNav();
-  }, [closeNav, shouldNavStayOpen]);
-
-  // Resets hover state if nav is disabled
-  // Without this the menu will pop back open when collapsing
-  if (!isCollapsed && isOpen) {
-    closeNav();
-  }
-
-  // Sets up event listeners hover and focus changes
-  useEffect(() => {
-    const element = navParentRef.current;
-    if (!element || !isCollapsed || !navParentRef.current) {
-      return () => {};
-    }
-
-    const navParentEl = navParentRef.current;
-    let closeTimer: NodeJS.Timeout;
-
-    const hoverIn = () => {
-      clearTimeout(closeTimer);
-      isHoveredRef.current = true;
-      setIsOpen(true);
-    };
-
-    const hoverOut = () => {
-      isHoveredRef.current = false;
-
-      closeTimer = setTimeout(() => {
-        tryCloseNav();
-      }, CLOSE_DELAY);
-    };
-
-    const handleMouseEnter = () => {
-      hoverIn();
-    };
-
-    const handleMouseLeave = (e: MouseEvent) => {
-      // Ignore mouse leave events on overlay elements like tooltips
-      if (
-        IGNORE_ELEMENTS.some(
-          selector =>
-            e.relatedTarget instanceof HTMLElement && e.relatedTarget.closest(selector)
-        )
-      ) {
-        return;
-      }
-
-      hoverOut();
-    };
-
-    element.addEventListener('mouseenter', handleMouseEnter);
-    element.addEventListener('mouseleave', handleMouseLeave);
-
-    const handleFocusIn = (e: FocusEvent) => {
-      if (e.target instanceof HTMLElement && e.target.matches(':focus-visible')) {
-        clearTimeout(closeTimer);
-        setIsOpen(true);
-      }
-    };
-
-    const handleFocusOut = () => {
-      tryCloseNav();
-    };
-
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') {
-        closeNav();
-      }
-    };
-
-    navParentEl.addEventListener('focusin', handleFocusIn);
-    navParentEl.addEventListener('focusout', handleFocusOut);
-    document.addEventListener('keydown', handleKeyDown);
-
-    return () => {
-      element.removeEventListener('mouseenter', handleMouseEnter);
-      element.removeEventListener('mouseleave', handleMouseLeave);
-      navParentEl.removeEventListener('focusin', handleFocusIn);
-      navParentEl.removeEventListener('focusout', handleFocusOut);
-      document.removeEventListener('keydown', handleKeyDown);
-      clearTimeout(closeTimer);
-    };
-  }, [
-    closeNav,
-    endInteraction,
-    isCollapsed,
-    isInteractingRef,
-    navParentRef,
-    shouldNavStayOpen,
-    tryCloseNav,
-  ]);
-
-  // Handles clicks outside the nav container
-  // Most of the the nav will already be closed by mouse or focus events,
-  // but this will catch instances where clicks on non-focusable elements
-  useInteractOutside({
-    ref: navParentRef,
-    onInteractOutside: e => {
-      if (
-        IGNORE_ELEMENTS.some(
-          selector => e.target instanceof HTMLElement && e.target.closest(selector)
-        )
-      ) {
-        return;
-      }
-
-      closeNav();
-    },
-    isDisabled: !isCollapsed || !isOpen,
-  });
-
-  return {isOpen};
-}
diff --git a/static/app/views/settings/account/accountSettingsNavigation.tsx b/static/app/views/settings/account/accountSettingsNavigation.tsx
index 033cc695df2e86..7dc21e89f3ee1a 100644
--- a/static/app/views/settings/account/accountSettingsNavigation.tsx
+++ b/static/app/views/settings/account/accountSettingsNavigation.tsx
@@ -1,4 +1,5 @@
 import type {Organization} from 'sentry/types/organization';
+import {PrimaryNavGroup} from 'sentry/views/nav/types';
 import getConfiguration from 'sentry/views/settings/account/navigationConfiguration';
 import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
 
@@ -13,6 +14,7 @@ function AccountSettingsNavigation({organization}: Props) {
       navigationObjects={getConfiguration({organization})}
       features={new Set(organization?.features)}
       access={new Set(organization?.access)}
+      primaryNavGroup={PrimaryNavGroup.SETTINGS}
     />
   );
 }
diff --git a/static/app/views/settings/components/settingsNavigation.tsx b/static/app/views/settings/components/settingsNavigation.tsx
index ee7c1939deea1a..c1986492f6b21b 100644
--- a/static/app/views/settings/components/settingsNavigation.tsx
+++ b/static/app/views/settings/components/settingsNavigation.tsx
@@ -1,10 +1,12 @@
-import {cloneElement, Component} from 'react';
+import {cloneElement, Component, Fragment} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 
 import {space} from 'sentry/styles/space';
 import {prefersStackedNav} from 'sentry/views/nav/prefersStackedNav';
+import {PRIMARY_NAV_GROUP_CONFIG} from 'sentry/views/nav/primary/config';
 import {SecondaryNav} from 'sentry/views/nav/secondary/secondary';
+import type {PrimaryNavGroup} from 'sentry/views/nav/types';
 import SettingsNavigationGroup from 'sentry/views/settings/components/settingsNavigationGroup';
 import SettingsNavigationGroupDeprecated from 'sentry/views/settings/components/settingsNavigationGroupDeprecated';
 import type {NavigationProps, NavigationSection} from 'sentry/views/settings/types';
@@ -30,26 +32,33 @@ type Props = DefaultProps &
      * The configuration for this navigation panel
      */
     navigationObjects: NavigationSection[];
+    /**
+     * The primary navigation group for this settings page
+     */
+    primaryNavGroup: PrimaryNavGroup;
   };
 
 function SettingsSecondaryNavigation({
   navigationObjects,
   hookConfigs,
   hooks,
+  primaryNavGroup,
   ...otherProps
 }: Props) {
   const navWithHooks = navigationObjects.concat(hookConfigs);
 
   return (
-    <SecondaryNav>
-      <SecondaryNav.Header />
+    <Fragment>
+      <SecondaryNav.Header>
+        {PRIMARY_NAV_GROUP_CONFIG[primaryNavGroup].label}
+      </SecondaryNav.Header>
       <SecondaryNav.Body>
         {navWithHooks.map(config => (
           <SettingsNavigationGroup key={config.name} {...otherProps} {...config} />
         ))}
         {hooks.map((Hook, i) => cloneElement(Hook, {key: `hook-${i}`}))}
       </SecondaryNav.Body>
-    </SecondaryNav>
+    </Fragment>
   );
 }
 
@@ -78,6 +87,7 @@ class SettingsNavigation extends Component<Props> {
       hookConfigs,
       stickyTop,
       organization,
+      primaryNavGroup,
       ...otherProps
     } = this.props;
     const navWithHooks = navigationObjects.concat(hookConfigs);
@@ -85,6 +95,7 @@ class SettingsNavigation extends Component<Props> {
     if (organization && prefersStackedNav(organization)) {
       return (
         <SettingsSecondaryNavigation
+          primaryNavGroup={primaryNavGroup}
           navigationObjects={navigationObjects}
           hooks={hooks}
           hookConfigs={hookConfigs}
diff --git a/static/app/views/settings/organization/organizationSettingsNavigation.tsx b/static/app/views/settings/organization/organizationSettingsNavigation.tsx
index 4762b3a5851249..2cbca90c029721 100644
--- a/static/app/views/settings/organization/organizationSettingsNavigation.tsx
+++ b/static/app/views/settings/organization/organizationSettingsNavigation.tsx
@@ -5,6 +5,7 @@ import HookStore from 'sentry/stores/hookStore';
 import type {HookName, Hooks} from 'sentry/types/hooks';
 import type {Organization} from 'sentry/types/organization';
 import withOrganization from 'sentry/utils/withOrganization';
+import {PrimaryNavGroup} from 'sentry/views/nav/types';
 import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
 import {getOrganizationNavigationConfiguration} from 'sentry/views/settings/organization/navigationConfiguration';
 import type {NavigationSection} from 'sentry/views/settings/types';
@@ -88,6 +89,7 @@ class OrganizationSettingsNavigation extends Component<Props, State> {
         hooks={hooks}
         hookConfigs={hookConfigs}
         isSelfHosted={isSelfHosted}
+        primaryNavGroup={PrimaryNavGroup.SETTINGS}
       />
     );
   }
diff --git a/static/app/views/settings/project/projectSettingsNavigation.tsx b/static/app/views/settings/project/projectSettingsNavigation.tsx
index f997b1eda7370b..17944713dfb69c 100644
--- a/static/app/views/settings/project/projectSettingsNavigation.tsx
+++ b/static/app/views/settings/project/projectSettingsNavigation.tsx
@@ -1,6 +1,7 @@
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import withProject from 'sentry/utils/withProject';
+import {PrimaryNavGroup} from 'sentry/views/nav/types';
 import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
 import getConfiguration from 'sentry/views/settings/project/navigationConfiguration';
 
@@ -21,6 +22,7 @@ function ProjectSettingsNavigation({organization, project}: Props) {
       features={new Set(organization.features)}
       organization={organization}
       project={project}
+      primaryNavGroup={PrimaryNavGroup.SETTINGS}
     />
   );
 }