From 9fb80909f7c28d4264e87d3e12722e97fab25792 Mon Sep 17 00:00:00 2001
From: Dustin Brett <dustinbrett@gmail.com>
Date: Fri, 21 Oct 2022 20:13:29 -0700
Subject: [PATCH] Adjust app nesting

---
 pages/_app.tsx  | 13 ++++++++-----
 pages/index.tsx | 11 ++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index a014e1ea..1161451a 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,3 +1,4 @@
+import { ErrorBoundary } from "components/pages/ErrorBoundary";
 import Metadata from "components/pages/Metadata";
 import StyledApp from "components/pages/StyledApp";
 import { FileSystemProvider } from "contexts/fileSystem";
@@ -10,12 +11,14 @@ const App = ({ Component, pageProps }: AppProps): React.ReactElement => (
   <ProcessProvider>
     <FileSystemProvider>
       <SessionProvider>
-        <StyledApp>
+        <ErrorBoundary>
           <Metadata />
-          <MenuProvider>
-            <Component {...pageProps} />
-          </MenuProvider>
-        </StyledApp>
+          <StyledApp>
+            <MenuProvider>
+              <Component {...pageProps} />
+            </MenuProvider>
+          </StyledApp>
+        </ErrorBoundary>
       </SessionProvider>
     </FileSystemProvider>
   </ProcessProvider>
diff --git a/pages/index.tsx b/pages/index.tsx
index eba1d394..a0c1734e 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,4 +1,3 @@
-import { ErrorBoundary } from "components/pages/ErrorBoundary";
 import AppsLoader from "components/system/Apps/AppsLoader";
 import Desktop from "components/system/Desktop";
 import Taskbar from "components/system/Taskbar";
@@ -14,12 +13,10 @@ const Index = (): React.ReactElement => {
   useGlobalErrorHandler();
 
   return (
-    <ErrorBoundary>
-      <Desktop>
-        <Taskbar />
-        <AppsLoader />
-      </Desktop>
-    </ErrorBoundary>
+    <Desktop>
+      <Taskbar />
+      <AppsLoader />
+    </Desktop>
   );
 };