diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index b143304f4..d9960ce7b 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -152,7 +152,7 @@ export default function ParameterComponent({
   return (
     <div
       ref={ref}
-      className="mt-1 flex w-full flex-wrap items-center justify-between bg-muted px-5 py-2"
+      className="nopan nodrag mt-1 flex w-full flex-wrap items-center justify-between bg-muted px-5 py-2"
     >
       <>
         <div
diff --git a/src/frontend/src/contexts/undoRedoContext.tsx b/src/frontend/src/contexts/undoRedoContext.tsx
index 3df201082..9c7210733 100644
--- a/src/frontend/src/contexts/undoRedoContext.tsx
+++ b/src/frontend/src/contexts/undoRedoContext.tsx
@@ -20,14 +20,6 @@ type UseUndoRedoOptions = {
   enableShortcuts: boolean;
 };
 
-type UseUndoRedo = (options?: UseUndoRedoOptions) => {
-  undo: () => void;
-  redo: () => void;
-  takeSnapshot: () => void;
-  canUndo: boolean;
-  canRedo: boolean;
-};
-
 type HistoryItem = {
   nodes: Node[];
   edges: Edge[];
diff --git a/src/frontend/src/modals/baseModal/index.tsx b/src/frontend/src/modals/baseModal/index.tsx
index 069cd8ee9..bdecd172a 100644
--- a/src/frontend/src/modals/baseModal/index.tsx
+++ b/src/frontend/src/modals/baseModal/index.tsx
@@ -97,25 +97,24 @@ function BaseModal({
       break;
   }
 
-  const { setDisableCopyPaste } = useContext(TabsContext);
-  const [openInner, setOpenInner] = useState(open ?? false);
+  const { disableCopyPaste, setDisableCopyPaste } = useContext(TabsContext);
+  const [keepDisabling, setKeepDisabling] = useState(false);
 
   useEffect(() => {
-    setOpenInner(open);
-  }, [open]);
-
-  useEffect(() => {
-    setOpen(openInner);
-    if (openInner) {
+    if (keepDisabling) {
       setDisableCopyPaste(true);
-    } else {
-      setDisableCopyPaste(false);
     }
-  }, [openInner]);
+  }, [disableCopyPaste]);
+
+  useEffect(() => {
+    if (!open) {
+      setKeepDisabling(false);
+    }
+  }, [open]);
 
   //UPDATE COLORS AND STYLE CLASSSES
   return (
-    <Dialog open={openInner} onOpenChange={setOpenInner}>
+    <Dialog modal={true} open={open} onOpenChange={setOpen}>
       <DialogTrigger className="w-full" hidden={triggerChild ? false : true}>
         {triggerChild}
       </DialogTrigger>
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index f27002847..9e83d11c6 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -379,12 +379,15 @@ export default function Page({ flow }: { flow: FlowType }) {
                   }}
                   edges={edges}
                   onPaneClick={() => {
+                    console.log("enableCopyPastePaneClick");
                     setDisableCopyPaste(false);
                   }}
                   onPaneMouseLeave={() => {
+                    console.log("enableCopyPastePaneLeave");
                     setDisableCopyPaste(true);
                   }}
                   onPaneMouseEnter={() => {
+                    console.log("enableCopyPastePaneEnter");
                     setDisableCopyPaste(false);
                   }}
                   onNodesChange={onNodesChangeMod}
@@ -407,8 +410,6 @@ export default function Page({ flow }: { flow: FlowType }) {
                   onDrop={onDrop}
                   onNodesDelete={onDelete}
                   onSelectionChange={onSelectionChange}
-                  nodesDraggable={!disableCopyPaste}
-                  panOnDrag={!disableCopyPaste}
                   zoomOnDoubleClick={!disableCopyPaste}
                   className="theme-attribution"
                   minZoom={0.01}