diff --git a/client/src/components/Canvas/CanvasComponents/DialogPopup.jsx b/client/src/components/Canvas/CanvasComponents/DialogPopup.jsx
new file mode 100644
index 0000000..f7e90cf
--- /dev/null
+++ b/client/src/components/Canvas/CanvasComponents/DialogPopup.jsx
@@ -0,0 +1,33 @@
+import { Dialog, Portal, CloseButton, Button } from "@chakra-ui/react";
+
+export default function DialogPopup({dialog}) {
+  console.log("3. dialog popup")
+  return(
+    <Dialog.RootProvider value={dialog}>
+      <Portal>
+        <Dialog.Backdrop />
+        <Dialog.Positioner>
+          <Dialog.Content>
+            <Dialog.Header>
+              <Dialog.Title>Leave Your Changes Behind?</Dialog.Title>
+            </Dialog.Header>
+            <Dialog.Body>
+              <p>
+                Click 'No' to go back and save your changes before navigating away from MyDashboard.
+              </p>
+            </Dialog.Body>
+            <Dialog.Footer>
+              <Dialog.ActionTrigger asChild>
+                <Button variant="outline">No</Button>
+              </Dialog.ActionTrigger>
+              <Button bg="tomato">Yes</Button>
+            </Dialog.Footer>
+            <Dialog.CloseTrigger asChild>
+              <CloseButton size="sm" />
+            </Dialog.CloseTrigger>
+          </Dialog.Content>
+        </Dialog.Positioner>
+      </Portal>
+    </Dialog.RootProvider>
+  );
+}
\ No newline at end of file
diff --git a/client/src/components/Dashboard.jsx b/client/src/components/Dashboard.jsx
index 4d4aff0..093ae7f 100644
--- a/client/src/components/Dashboard.jsx
+++ b/client/src/components/Dashboard.jsx
@@ -34,15 +34,12 @@ export default function Dashboard() {
   
   // Prevent navigation while in Edit mode without saving or cancelling
   const handleViewChange = (nextView) => { 
+    console.log("1. handling view change")
     if (view === "mydashboard" && isEditable) {
-      dialog.open();
-      <DialogPopup dialog={dialog}/>
-      
-      
-      
-      
-      
-      
+      console.log("2. currently editing");
+      dialog.setOpen(true);
+      return;
+
       // const confirmed = window.confirm(
       //   "You have unsaved changes. Discard them and continue?"
       // );
@@ -62,6 +59,8 @@ export default function Dashboard() {
   const headerProps = { onChangeView: handleViewChange };
   
   return (
+    <> 
+      <DialogPopup dialog={dialog} />
       <Grid css={styles}
         templateRows="1fr 11fr"
         // templateColumns="1fr 20fr"
@@ -79,5 +78,6 @@ export default function Dashboard() {
           <Canvas {...canvasProps}/>
         </GridItem>
       </Grid>
+    </>
   );
 }
\ No newline at end of file