diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index d2aec8242..9ee1e83d7 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2,6 +2,9 @@ import React, { Suspense } from 'react';
 import { RainbowThemeProvider } from './components/shared/RainbowThemeProvider';
 import { FileContextProvider } from './contexts/FileContext';
 import { FilesModalProvider } from './contexts/FilesModalContext';
+import { FileSelectionProvider } from './contexts/FileSelectionContext';
+import { ToolWorkflowProvider } from './contexts/ToolWorkflowContext';
+import { SidebarProvider } from './contexts/SidebarContext';
 import HomePage from './pages/HomePage';
 
 // Import global styles
@@ -28,7 +31,13 @@ export default function App() {
       <RainbowThemeProvider>
         <FileContextProvider enableUrlSync={true} enablePersistence={true}>
           <FilesModalProvider>
-            <HomePage />
+            <FileSelectionProvider>
+              <ToolWorkflowProvider>
+                <SidebarProvider>
+                  <HomePage />
+                </SidebarProvider>
+              </ToolWorkflowProvider>
+            </FileSelectionProvider>
           </FilesModalProvider>
         </FileContextProvider>
       </RainbowThemeProvider>
diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx
index d26a40caa..6d9a386fd 100644
--- a/frontend/src/pages/HomePage.tsx
+++ b/frontend/src/pages/HomePage.tsx
@@ -1,10 +1,9 @@
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { useFileContext } from "../contexts/FileContext";
-import { FileSelectionProvider, useFileSelection } from "../contexts/FileSelectionContext";
-import { ToolWorkflowProvider, useToolWorkflow } from "../contexts/ToolWorkflowContext";
+import { useFileSelection } from "../contexts/FileSelectionContext";
+import { useToolWorkflow } from "../contexts/ToolWorkflowContext";
 import { Group } from "@mantine/core";
-import { SidebarProvider, useSidebarContext } from "../contexts/SidebarContext";
+import { useSidebarContext } from "../contexts/SidebarContext";
 import { useDocumentMeta } from "../hooks/useDocumentMeta";
 import { getBaseUrl } from "../constants/app";
 
@@ -14,7 +13,7 @@ import QuickAccessBar from "../components/shared/QuickAccessBar";
 import FileManager from "../components/FileManager";
 
 
-function HomePageContent() {
+export default function HomePage() {
   const { t } = useTranslation();
   const {
     sidebarRefs,
@@ -64,16 +63,3 @@ function HomePageContent() {
     </Group>
   );
 }
-
-export default function HomePage() {
-  const { setCurrentView } = useFileContext();
-  return (
-    <FileSelectionProvider>
-      <ToolWorkflowProvider onViewChange={setCurrentView as any /* FIX ME */}>
-        <SidebarProvider>
-          <HomePageContent />
-        </SidebarProvider>
-      </ToolWorkflowProvider>
-    </FileSelectionProvider>
-  );
-}
\ No newline at end of file