diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index f6403b8cb..d7b9ae5f8 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -14,7 +14,6 @@ import PromptAreaComponent from "../../../../components/promptComponent";
 import TextAreaComponent from "../../../../components/textAreaComponent";
 import ToggleShadComponent from "../../../../components/toggleShadComponent";
 import { MAX_LENGTH_TO_SCROLL_TOOLTIP } from "../../../../constants/constants";
-import { PopUpContext } from "../../../../contexts/popUpContext";
 import { TabsContext } from "../../../../contexts/tabsContext";
 import { typesContext } from "../../../../contexts/typesContext";
 import { ParameterComponentType } from "../../../../types/components";
@@ -52,7 +51,8 @@ export default function ParameterComponent({
   const updateNodeInternals = useUpdateNodeInternals();
   const [position, setPosition] = useState(0);
   const { setTabsState, tabId, save, flows } = useContext(TabsContext);
-  const { closeEdit } = useContext(PopUpContext);
+
+  const flow = flows.find((f) => f.id === tabId).data.nodes;
 
   // Update component position
   useEffect(() => {
@@ -87,6 +87,7 @@ export default function ParameterComponent({
         },
       };
     });
+    renderTooltips();
   };
 
   useEffect(() => {
@@ -102,14 +103,8 @@ export default function ParameterComponent({
     );
   }, [info]);
 
-  useEffect(() => {
-    let groupedObj = groupByFamily(
-      myData,
-      tooltipTitle,
-      left,
-      data.type,
-      flows.find((f) => f.id === tabId).data.nodes
-    );
+  function renderTooltips() {
+    let groupedObj = groupByFamily(myData, tooltipTitle, left, data.type, flow);
 
     if (groupedObj?.length === 0) {
       groupedObj = groupByFamilyCustom(
@@ -117,7 +112,7 @@ export default function ParameterComponent({
         tooltipTitle,
         left,
         data.type,
-        flows.find((f) => f.id === tabId).data.nodes
+        flow
       );
     }
 
@@ -172,11 +167,11 @@ export default function ParameterComponent({
         );
       });
     }
-  }, [
-    tooltipTitle,
-    flows.find((f) => f.id === tabId).data.nodes.length,
-    closeEdit,
-  ]);
+  }
+
+  useEffect(() => {
+    renderTooltips();
+  }, [tooltipTitle, flow.length]);
   return (
     <div
       ref={ref}
diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx
index 229396e97..53dda0e81 100644
--- a/src/frontend/src/modals/codeAreaModal/index.tsx
+++ b/src/frontend/src/modals/codeAreaModal/index.tsx
@@ -11,11 +11,9 @@ import { Button } from "../../components/ui/button";
 import { CODE_PROMPT_DIALOG_SUBTITLE } from "../../constants/constants";
 import { alertContext } from "../../contexts/alertContext";
 import { darkContext } from "../../contexts/darkContext";
-import { PopUpContext } from "../../contexts/popUpContext";
 import { typesContext } from "../../contexts/typesContext";
 import { postCustomComponent, postValidateCode } from "../../controllers/API";
 import { APIClassType } from "../../types/api";
-import { getRandomKeyByssmm } from "../../utils/utils";
 import BaseModal from "../baseModal";
 
 export default function CodeAreaModal({
@@ -41,7 +39,6 @@ export default function CodeAreaModal({
   const [error, setError] = useState<{
     detail: { error: string; traceback: string };
   }>(null);
-  const { setCloseEdit } = useContext(PopUpContext);
 
   useEffect(() => {
     // if nodeClass.template has more fields other than code and dynamic is true
@@ -64,7 +61,6 @@ export default function CodeAreaModal({
             });
             setOpen(false);
             setValue(code);
-            setCloseEdit(getRandomKeyByssmm().toString());
             // setValue(code);
           } else {
             if (funcErrors.length !== 0) {
@@ -101,7 +97,6 @@ export default function CodeAreaModal({
           setNodeClass(data);
           setValue(code);
           setOpen(false);
-          setCloseEdit(getRandomKeyByssmm().toString());
         }
       })
       .catch((err) => {