diff --git a/frontend/src/components/layout/Workbench.tsx b/frontend/src/components/layout/Workbench.tsx
index 8ce2d87f2..830d4742b 100644
--- a/frontend/src/components/layout/Workbench.tsx
+++ b/frontend/src/components/layout/Workbench.tsx
@@ -3,6 +3,8 @@ import { Box } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { useRainbowThemeContext } from '../shared/RainbowThemeProvider';
 import { useWorkbenchState, useToolSelection } from '../../contexts/ToolWorkflowContext';
+import { useFileHandler } from '../../hooks/useFileHandler';
+import { useFileContext } from '../../contexts/FileContext';
 
 import TopControls from '../shared/TopControls';
 import FileEditor from '../fileEditor/FileEditor';
@@ -12,27 +14,13 @@ import Viewer from '../viewer/Viewer';
 import ToolRenderer from '../tools/ToolRenderer';
 import LandingPage from '../shared/LandingPage';
 
-interface WorkbenchProps {
-  /** Currently active files */
-  activeFiles: File[];
-  /** Current view mode */
-  currentView: string;
-  /** Handler for view changes */
-  onViewChange: (view: string) => void;
-  /** Handler for adding files to active files */
-  onAddToActiveFiles: (file: File) => void;
-}
-
-export default function Workbench({
-  activeFiles,
-  currentView,
-  onViewChange,
-  onAddToActiveFiles
-}: WorkbenchProps) {
+// No props needed - component uses contexts directly
+export default function Workbench() {
   const { t } = useTranslation();
   const { isRainbowMode } = useRainbowThemeContext();
   
-  // Use context-based hooks to eliminate prop drilling
+  // Use context-based hooks to eliminate all prop drilling
+  const { activeFiles, currentView, setCurrentView } = useFileContext();
   const { 
     previewFile, 
     pageEditorFunctions, 
@@ -43,6 +31,7 @@ export default function Workbench({
   } = useWorkbenchState();
   
   const { selectedToolKey, selectedTool, handleToolSelect } = useToolSelection();
+  const { addToActiveFiles } = useFileHandler();
 
   const handlePreviewClose = () => {
     setPreviewFile(null);
@@ -58,7 +47,7 @@ export default function Workbench({
       handleToolSelect('convert');
       sessionStorage.removeItem('previousMode');
     } else {
-      onViewChange('fileEditor');
+      setCurrentView('fileEditor' as any);
     }
   };
 
@@ -84,11 +73,11 @@ export default function Workbench({
             supportedExtensions={selectedTool?.supportedFormats || ["pdf"]}
             {...(!selectedToolKey && {
               onOpenPageEditor: (file) => {
-                onViewChange("pageEditor");
+                setCurrentView("pageEditor" as any);
               },
               onMergeFiles: (filesToMerge) => {
-                filesToMerge.forEach(onAddToActiveFiles);
-                onViewChange("viewer");
+                filesToMerge.forEach(addToActiveFiles);
+                setCurrentView("viewer" as any);
               }
             })}
           />
@@ -159,7 +148,7 @@ export default function Workbench({
       {/* Top Controls */}
       <TopControls
         currentView={currentView}
-        setCurrentView={onViewChange}
+        setCurrentView={setCurrentView}
         selectedToolKey={selectedToolKey}
       />
       
diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx
index 5e01df805..c9eb561b3 100644
--- a/frontend/src/pages/HomePage.tsx
+++ b/frontend/src/pages/HomePage.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
 import { useFileContext } from "../contexts/FileContext";
 import { FileSelectionProvider, useFileSelection } from "../contexts/FileSelectionContext";
 import { ToolWorkflowProvider, useToolSelection } from "../contexts/ToolWorkflowContext";
-import { useFileHandler } from "../hooks/useFileHandler";
 import { Group } from "@mantine/core";
 
 import ToolPanel from "../components/tools/ToolPanel";
@@ -13,13 +12,9 @@ import FileUploadModal from "../components/shared/FileUploadModal";
 
 function HomePageContent() {
   const { t } = useTranslation();
-
-  const fileContext = useFileContext();
-  const { activeFiles, currentView, setCurrentView } = fileContext;
   const { setMaxFiles, setIsToolMode, setSelectedFiles } = useFileSelection();
-  const { addToActiveFiles } = useFileHandler();
 
-  const { selectedTool, selectedToolKey } = useToolSelection();
+  const { selectedTool } = useToolSelection();
 
   // Update file selection context when tool changes
   useEffect(() => {
@@ -33,13 +28,6 @@ function HomePageContent() {
     }
   }, [selectedTool, setMaxFiles, setIsToolMode, setSelectedFiles]);
 
-  // These handlers are now provided by the context
-  // The context handles the coordination between tool selection and UI state
-
-  const handleViewChange = useCallback((view: string) => {
-    setCurrentView(view as any);
-  }, [setCurrentView]);
-
   return (
     <Group
       align="flex-start"
@@ -47,38 +35,20 @@ function HomePageContent() {
       className="min-h-screen w-screen overflow-hidden flex-nowrap flex"
     >
       <QuickAccessBar />
-
       <ToolPanel />
-
-      <Workbench
-        activeFiles={activeFiles}
-        currentView={currentView}
-        onViewChange={handleViewChange}
-        onAddToActiveFiles={addToActiveFiles}
-      />
-
-      {/* Global Modals */}
+      <Workbench />
       <FileUploadModal selectedTool={selectedTool} />
     </Group>
   );
 }
 
-// HomePage wrapper that connects context to file context  
-function HomePageWrapper() {
-  const { setCurrentView } = useFileContext();
-
-  return (
-    <ToolWorkflowProvider onViewChange={setCurrentView}>
-      <HomePageContent />
-    </ToolWorkflowProvider>
-  );
-}
-
-// Main HomePage component wrapped with providers
 export default function HomePage() {
+  const { setCurrentView } = useFileContext();
   return (
     <FileSelectionProvider>
-      <HomePageWrapper />
+      <ToolWorkflowProvider onViewChange={setCurrentView}>
+        <HomePageContent />
+      </ToolWorkflowProvider>
     </FileSelectionProvider>
   );
 }