diff --git a/console/client/src/features/timeline/TimelinePage.tsx b/console/client/src/features/timeline/TimelinePage.tsx
index 947844cf29..993441477e 100644
--- a/console/client/src/features/timeline/TimelinePage.tsx
+++ b/console/client/src/features/timeline/TimelinePage.tsx
@@ -23,9 +23,11 @@ export const TimelinePage = () => {
       <PageHeader icon={<ListBulletIcon />} title='Events'>
         <TimelineTimeControls onTimeSettingsChange={handleTimeSettingsChanged} />
       </PageHeader>
-      <div className='flex h-full'>
-        <TimelineFilterPanel onFiltersChanged={handleFiltersChanged} />
-        <div className='flex-grow'>
+      <div className='flex' style={{ height: 'calc(100% - 44px)' }}>
+        <div className='sticky top-0 flex-none overflow-y-auto'>
+          <TimelineFilterPanel onFiltersChanged={handleFiltersChanged} />
+        </div>
+        <div className='flex-grow overflow-y-scroll'>
           <Timeline timeSettings={timeSettings} filters={filters} />
         </div>
       </div>
diff --git a/console/client/src/layout/Layout.tsx b/console/client/src/layout/Layout.tsx
index 780bb3f56f..954b687b6d 100644
--- a/console/client/src/layout/Layout.tsx
+++ b/console/client/src/layout/Layout.tsx
@@ -8,8 +8,8 @@ export const Layout = () => {
     <div className='flex h-screen'>
       <Navigation />
 
-      <main className='flex-1 overflow-hidden'>
-        <section className='overflow-y-auto h-full'>
+      <main className='flex-1 overflow-y-auto'>
+        <section className='h-full relative'>
           <Outlet />
         </section>
       </main>