diff --git a/job-tracker-ui/src/App.tsx b/job-tracker-ui/src/App.tsx
index 3f26102f..e4a94d5a 100644
--- a/job-tracker-ui/src/App.tsx
+++ b/job-tracker-ui/src/App.tsx
@@ -556,8 +556,8 @@ function Application() {
   ], { future: { v7_relativeSplatPath: true } }), [jobColumns, jobPageSize]);
 
   return (
-    <ToastProvider>
-      <JobTrackerThemeProvider preference={themeMode} systemPrefersDark={systemPrefersDark}>
+    <JobTrackerThemeProvider preference={themeMode} systemPrefersDark={systemPrefersDark}>
+      <ToastProvider>
         <I18nProvider>
           <ConfirmProvider>
             <PromptProvider>
@@ -567,7 +567,7 @@ function Application() {
             </PromptProvider>
           </ConfirmProvider>
         </I18nProvider>
-      </JobTrackerThemeProvider>
-    </ToastProvider>
+      </ToastProvider>
+    </JobTrackerThemeProvider>
   );
 }