diff --git a/app/layout.tsx b/app/layout.tsx
index 491da80..f48a415 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,8 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import { Analytics } from "@vercel/analytics/react";
+import { DiagramProvider } from "@/contexts/diagram-context";
+
 import "./globals.css";
 
 const geistSans = Geist({
@@ -28,7 +30,8 @@ export default function RootLayout({
             <body
                 className={`${geistSans.variable} ${geistMono.variable} antialiased`}
             >
-                {children}
+                <DiagramProvider>{children}</DiagramProvider>
+
                 <Analytics />
             </body>
         </html>
diff --git a/app/page.tsx b/app/page.tsx
index e24cde8..af14beb 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,30 +2,28 @@
 import React from "react";
 import { DrawIoEmbed } from "react-drawio";
 import ChatPanel from "@/components/chat-panel";
-import { DiagramProvider, useDiagram } from "@/contexts/diagram-context";
+import { useDiagram } from "@/contexts/diagram-context";
 
 export default function Home() {
     const { drawioRef, handleDiagramExport } = useDiagram();
 
     return (
-        <DiagramProvider>
-            <div className="flex h-screen bg-gray-100">
-                <div className="w-2/3 p-1 h-full relative">
-                    <DrawIoEmbed
-                        ref={drawioRef}
-                        onExport={handleDiagramExport}
-                        urlParameters={{
-                            spin: true,
-                            libraries: false,
-                            saveAndExit: false,
-                            noExitBtn: true,
-                        }}
-                    />
-                </div>
-                <div className="w-1/3 h-full p-1">
-                    <ChatPanel />
-                </div>
+        <div className="flex h-screen bg-gray-100">
+            <div className="w-2/3 p-1 h-full relative">
+                <DrawIoEmbed
+                    ref={drawioRef}
+                    onExport={handleDiagramExport}
+                    urlParameters={{
+                        spin: true,
+                        libraries: false,
+                        saveAndExit: false,
+                        noExitBtn: true,
+                    }}
+                />
             </div>
-        </DiagramProvider>
+            <div className="w-1/3 h-full p-1">
+                <ChatPanel />
+            </div>
+        </div>
     );
 }
