diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8f31bc4..54eebb9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -33,19 +33,14 @@ function ProtectedLayout() {
   );
 }
 
-// Wrapper for routes with providers
+// Wrapper for routes with providers (outside Router)
 function AppProviders({ children }: { children: React.ReactNode }) {
   return (
     <I18nProvider>
       <ThemeProvider defaultTheme="system">
         <QueryProvider>
           <AuthProvider>
-            <OnboardingProvider>
-              <KeyboardShortcutsProvider>
-                {children}
-                <CommandPalette />
-              </KeyboardShortcutsProvider>
-            </OnboardingProvider>
+            {children}
           </AuthProvider>
         </QueryProvider>
       </ThemeProvider>
@@ -53,33 +48,47 @@ function AppProviders({ children }: { children: React.ReactNode }) {
   );
 }
 
+// Wrapper for providers that need Router context
+function RouterProviders({ children }: { children: React.ReactNode }) {
+  return (
+    <OnboardingProvider>
+      <KeyboardShortcutsProvider>
+        {children}
+        <CommandPalette />
+      </KeyboardShortcutsProvider>
+    </OnboardingProvider>
+  );
+}
+
 function App() {
   return (
     <AppProviders>
       <BrowserRouter>
-        <Suspense fallback={<PageLoader />}>
-          <Routes>
-            {/* Public routes */}
-            <Route path="/login" element={<Login />} />
-            <Route path="/register" element={<Register />} />
-            
-            {/* Protected routes with layout */}
-            <Route path="/" element={<ProtectedLayout />}>
-              <Route index element={<Dashboard />} />
-              <Route path="scenarios" element={<ScenariosPage />} />
-              <Route path="scenarios/:id" element={<ScenarioDetail />} />
-              <Route path="scenarios/:id/reports" element={<Reports />} />
-              <Route path="compare" element={<Compare />} />
-              <Route path="settings/api-keys" element={<ApiKeys />} />
-              <Route path="analytics" element={<AnalyticsDashboard />} />
-            </Route>
-            
-            {/* 404 */}
-            <Route path="*" element={<NotFound />} />
-          </Routes>
-        </Suspense>
+        <RouterProviders>
+          <Suspense fallback={<PageLoader />}>
+            <Routes>
+              {/* Public routes */}
+              <Route path="/login" element={<Login />} />
+              <Route path="/register" element={<Register />} />
+              
+              {/* Protected routes with layout */}
+              <Route path="/" element={<ProtectedLayout />}>
+                <Route index element={<Dashboard />} />
+                <Route path="scenarios" element={<ScenariosPage />} />
+                <Route path="scenarios/:id" element={<ScenarioDetail />} />
+                <Route path="scenarios/:id/reports" element={<Reports />} />
+                <Route path="compare" element={<Compare />} />
+                <Route path="settings/api-keys" element={<ApiKeys />} />
+                <Route path="analytics" element={<AnalyticsDashboard />} />
+              </Route>
+              
+              {/* 404 */}
+              <Route path="*" element={<NotFound />} />
+            </Routes>
+          </Suspense>
+        </RouterProviders>
+        <Toaster />
       </BrowserRouter>
-      <Toaster />
     </AppProviders>
   );
 }