diff --git a/apps/frontend/src/widgets/broker-account-layout/index.ts b/apps/frontend/src/widgets/broker-account-layout/index.ts
index 1c833dc..004ed7c 100644
--- a/apps/frontend/src/widgets/broker-account-layout/index.ts
+++ b/apps/frontend/src/widgets/broker-account-layout/index.ts
@@ -1,3 +1,3 @@
 export { useBrokerAccountContext } from './lib/useBrokerAccountContext'
-export type { BrokerAccountContext } from './ui/BrokerAccountLayout'
+export type { BrokerAccountContextValue } from './ui/BrokerAccountLayout'
 export { BrokerAccountLayout } from './ui/BrokerAccountLayout'
diff --git a/apps/frontend/src/widgets/broker-account-layout/lib/useBrokerAccountContext.ts b/apps/frontend/src/widgets/broker-account-layout/lib/useBrokerAccountContext.ts
index 680a26c..2df2875 100644
--- a/apps/frontend/src/widgets/broker-account-layout/lib/useBrokerAccountContext.ts
+++ b/apps/frontend/src/widgets/broker-account-layout/lib/useBrokerAccountContext.ts
@@ -1,6 +1,10 @@
-import { useParams } from '@tanstack/react-router'
+import { useContext } from 'react'
+import { BrokerAccountContext } from '../ui/BrokerAccountLayout'
 
 export function useBrokerAccountContext() {
-  const { accountId = '' } = useParams({ from: '/broker/$accountId' })
-  return { accountId }
+  const context = useContext(BrokerAccountContext)
+  if (!context) {
+    throw new Error('useBrokerAccountContext must be used within BrokerAccountLayout')
+  }
+  return context
 }
diff --git a/apps/frontend/src/widgets/broker-account-layout/ui/BrokerAccountLayout.tsx b/apps/frontend/src/widgets/broker-account-layout/ui/BrokerAccountLayout.tsx
index 88a7b65..d524645 100644
--- a/apps/frontend/src/widgets/broker-account-layout/ui/BrokerAccountLayout.tsx
+++ b/apps/frontend/src/widgets/broker-account-layout/ui/BrokerAccountLayout.tsx
@@ -1,8 +1,10 @@
 import { Heading } from '@moex-vibe/design-system'
 import { Box } from '@mui/material'
+import type { UseQueryResult } from '@tanstack/react-query'
 import { Link, useParams } from '@tanstack/react-router'
-import type { ReactNode } from 'react'
+import { createContext, type ReactNode } from 'react'
 import { useBrokerPortfolio } from '@/entities/broker-account'
+import type { BrokerPortfolio } from '@/shared/api'
 
 const baseLinkStyle: React.CSSProperties = {
   padding: '10px 12px',
@@ -17,69 +19,79 @@ const baseLinkStyle: React.CSSProperties = {
 }
 
 const links = [
-  { to: '.', label: 'Обзор' },
+  { to: '', label: 'Обзор' },
   { to: '/shares', label: 'Акции' },
   { to: '/bonds', label: 'Облигации' },
   { to: '/operations', label: 'Операции' },
   { to: '/events', label: 'События' },
 ]
 
+export interface BrokerAccountContextValue {
+  accountId: string
+  portfolio: UseQueryResult<BrokerPortfolio>
+}
+
+export const BrokerAccountContext = createContext<BrokerAccountContextValue | null>(null)
+
 export function BrokerAccountLayout({ children }: { children: ReactNode }) {
   const { accountId = '' } = useParams({ from: '/broker/$accountId' })
   const portfolio = useBrokerPortfolio(accountId)
   const basePath = `/broker/${encodeURIComponent(accountId)}`
 
   return (
-    <Box sx={{ display: 'grid', gap: 3 }}>
-      <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.25 }}>
-        <Heading level={1}>{portfolio.data?.account.name || 'Брокерский счёт'}</Heading>
-      </Box>
+    <BrokerAccountContext.Provider value={{ accountId, portfolio }}>
+      <Box sx={{ display: 'grid', gap: 3 }}>
+        <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.25 }}>
+          <Heading level={1}>{portfolio.data?.account.name || 'Брокерский счёт'}</Heading>
+        </Box>
 
-      <Box
-        sx={{
-          display: 'grid',
-          gridTemplateColumns: '1fr',
-          gap: 2,
-          '@media (min-width: 720px)': {
-            gridTemplateColumns: 'minmax(150px, 190px) minmax(0, 1fr)',
-            gap: 3,
-          },
-        }}
-      >
         <Box
-          component="nav"
-          aria-label="Разделы брокерского счёта"
           sx={{
-            display: 'flex',
-            flexDirection: 'column',
-            gap: 0.5,
-            '@media (max-width: 719px)': {
-              flexDirection: 'row',
-              overflowX: 'auto',
-              scrollbarWidth: 'thin',
+            display: 'grid',
+            gridTemplateColumns: '1fr',
+            gap: 2,
+            '@media (min-width: 720px)': {
+              gridTemplateColumns: 'minmax(150px, 190px) minmax(0, 1fr)',
+              gap: 3,
             },
           }}
         >
-          {links.map((link) => (
-            <Link
-              key={link.to}
-              to={`${basePath}${link.to}`}
-              style={baseLinkStyle}
-              activeProps={{
-                style: {
-                  ...baseLinkStyle,
-                  color: 'var(--color-primary)',
-                  fontWeight: 700,
-                },
-              }}
-            >
-              {link.label}
-            </Link>
-          ))}
-        </Box>
+          <Box
+            component="nav"
+            aria-label="Разделы брокерского счёта"
+            sx={{
+              display: 'flex',
+              flexDirection: 'column',
+              gap: 0.5,
+              '@media (max-width: 719px)': {
+                flexDirection: 'row',
+                overflowX: 'auto',
+                scrollbarWidth: 'thin',
+              },
+            }}
+          >
+            {links.map((link) => (
+              <Link
+                key={link.to}
+                to={`${basePath}${link.to}`}
+                style={baseLinkStyle}
+                activeOptions={{ exact: link.to === '' }}
+                activeProps={{
+                  style: {
+                    ...baseLinkStyle,
+                    color: 'var(--color-primary)',
+                    fontWeight: 700,
+                  },
+                }}
+              >
+                {link.label}
+              </Link>
+            ))}
+          </Box>
 
-        <Box sx={{ minWidth: 0 }}>{children}</Box>
+          <Box sx={{ minWidth: 0 }}>{children}</Box>
+        </Box>
       </Box>
-    </Box>
+    </BrokerAccountContext.Provider>
   )
 }