diff --git a/client/src/components/Canvas/views/Home.jsx b/client/src/components/Canvas/views/Home.jsx
index 6d0dfd0..1bd1d8d 100644
--- a/client/src/components/Canvas/views/Home.jsx
+++ b/client/src/components/Canvas/views/Home.jsx
@@ -72,7 +72,8 @@ export default function Home({...props}) {
 
   const onEditWidgets = () => {
     console.log("widgets are now editable");
-    setOriginalLayout(layout); // Backup layout before editing
+    beginEditIfNeeded(); // Save state before anything else
+    // setOriginalLayout(layout); // Backup layout before editing
     // Set all widgets to editable, static: false
     setLayout(prevLayout =>
       prevLayout.map(item => ({
@@ -100,7 +101,8 @@ export default function Home({...props}) {
 
   const onDeleteWidgets = () => {
     console.log("Start deleting widgets...");
-    setOriginalLayout(layout);
+    beginEditIfNeeded(); // Save state before anything else
+    // setOriginalLayout(layout);
     setIsEditable(true);
     setIsDelete(true);
   }
diff --git a/client/src/components/Dashboard.jsx b/client/src/components/Dashboard.jsx
index cd475fa..0177125 100644
--- a/client/src/components/Dashboard.jsx
+++ b/client/src/components/Dashboard.jsx
@@ -30,13 +30,14 @@ export default function Dashboard() {
 
   const onCancel = () => {
     console.log("canceling changes...");
+    console.log(originalWidgets);
     if (originalLayout.length) { 
       setLayout(originalLayout.map(item => ({
         ...item, 
         static: true
       })));
     };
-    setWidgetArray(originalWidgets.length ? originalWidgets : []);
+    setWidgetArray(originalWidgets);
     setIsEditable(false);
     setIsDelete(false);
     setOriginalLayout([]); 
@@ -64,7 +65,7 @@ export default function Dashboard() {
 
   // Prop Forwarding
   const canvasProps = { view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView: handleViewChange, 
-    onCancel, isEditable, setIsEditable, isDelete, setIsDelete, widgetArray, setWidgetArray, setOriginalWidgets, beginEditIfNeeded
+    onCancel, isEditable, setIsEditable, isDelete, setIsDelete, widgetArray, setWidgetArray, originalWidgets, setOriginalWidgets, beginEditIfNeeded
   };
   const sidebarProps = { view, onChangeView: handleViewChange, darkMode, setDarkMode };
   const headerProps = { onChangeView: handleViewChange };