diff --git a/src/frontend/src/contexts/flowsContext.tsx b/src/frontend/src/contexts/flowsContext.tsx
index 526df8418..db20b3745 100644
--- a/src/frontend/src/contexts/flowsContext.tsx
+++ b/src/frontend/src/contexts/flowsContext.tsx
@@ -600,6 +600,8 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
   }
 
   async function saveFlow(newFlow: FlowType, silent?: boolean) {
+    console.log(newFlow);
+
     if (newFlow?.data?.nodes?.length === 0) return;
     try {
       // updates flow in db
@@ -613,10 +615,14 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
           const newFlows = [...prevState];
           const index = newFlows.findIndex((flow) => flow.id === newFlow.id);
           if (index !== -1) {
-            newFlows[index].description = newFlow.description ?? "";
-            newFlows[index].data = newFlow.data;
-            newFlows[index].name = newFlow.name;
+            newFlows[index] = {
+              ...newFlows[index],
+              description: updatedFlow.description,
+              data: updatedFlow.data,
+              name: updatedFlow.name,
+            };
           }
+
           return newFlows;
         });
         //update tabs state
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index 5e5661687..a3817c190 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -57,7 +57,7 @@ const EditNodeModal = forwardRef(
   ) => {
     const updateNodeInternals = useUpdateNodeInternals();
 
-    const myData = useRef(data);
+    let myData = useRef(data);
 
     const { setTabsState, tabId } = useContext(FlowsContext);
     const { reactFlowInstance } = useContext(typesContext);
@@ -69,6 +69,10 @@ const EditNodeModal = forwardRef(
     function changeAdvanced(n) {
       myData.current.node!.template[n].advanced =
         !myData.current.node!.template[n].advanced;
+
+      myData.current = {
+        ...myData.current,
+      };
       setAdv(!adv);
     }