diff --git a/apps/studio/routes/__root.tsx b/apps/studio/routes/__root.tsx
index acc4dbfef9c..cdd6b910c21 100644
--- a/apps/studio/routes/__root.tsx
+++ b/apps/studio/routes/__root.tsx
@@ -44,6 +44,7 @@ import { TooltipProvider } from 'ui'
 
 import { StudioCommandProvider as CommandProvider } from '@/components/interfaces/App/CommandMenu/StudioCommandProvider'
 import { FeaturePreviewContextProvider } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { MainScrollContainerProvider } from '@/components/layouts/MainScrollContainerContext'
 import { GlobalErrorBoundaryState } from '@/components/ui/ErrorBoundary/GlobalErrorBoundaryState'
 import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -248,7 +249,9 @@ function RootComponent() {
                     <AiAssistantStateContextProvider>
                       <CommandProvider>
                         <FeaturePreviewContextProvider>
-                          <Outlet />
+                          <MainScrollContainerProvider>
+                            <Outlet />
+                          </MainScrollContainerProvider>
                         </FeaturePreviewContextProvider>
                       </CommandProvider>
                     </AiAssistantStateContextProvider>