diff --git a/src/frontend/src/contexts/flowsContext.tsx b/src/frontend/src/contexts/flowsContext.tsx
index 32243a9e9..8d7d3b6f2 100644
--- a/src/frontend/src/contexts/flowsContext.tsx
+++ b/src/frontend/src/contexts/flowsContext.tsx
@@ -172,8 +172,9 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
       }
     });
     setData((prev) => {
-      prev["saved_components"] = cloneDeep(savedComponents);
-      return prev;
+      let newData = cloneDeep(prev);
+      newData["saved_components"] = cloneDeep(savedComponents);
+      return newData;
     });
   }
 
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sideBarDraggableComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sideBarDraggableComponent/index.tsx
index d6e364a55..0c69a8f28 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sideBarDraggableComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sideBarDraggableComponent/index.tsx
@@ -41,11 +41,13 @@ export default function SidebarDraggableComponent({
   const popoverRef = useRef<HTMLDivElement>(null);
 
   const handlePointerDown = (e) => {
-    const rect = popoverRef.current?.getBoundingClientRect() ?? {
-      left: 0,
-      top: 0,
-    };
-    setCursorPos({ x: e.clientX - rect.left, y: e.clientY - rect.top });
+    if (!open) {
+      const rect = popoverRef.current?.getBoundingClientRect() ?? {
+        left: 0,
+        top: 0,
+      };
+      setCursorPos({ x: e.clientX - rect.left, y: e.clientY - rect.top });
+    }
   };
 
   function handleSelectChange(value: string) {
@@ -74,9 +76,8 @@ export default function SidebarDraggableComponent({
     >
       <div
         onPointerDown={handlePointerDown}
-        onContextMenu={(e) => {
+        onContextMenuCapture={(e) => {
           e.preventDefault();
-          console.log("que");
           setOpen(true);
         }}
         key={itemName}