diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx
index a41b361e8..76c07c5aa 100644
--- a/src/frontend/src/modals/ApiModal/index.tsx
+++ b/src/frontend/src/modals/ApiModal/index.tsx
@@ -374,8 +374,7 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                     />
                                                   ) : t.data.node.template[n]
                                                       .multiline ? (
-                                                    <div>
-                                                      <ShadTooltip
+                                                        <ShadTooltip
                                                         delayDuration={1000}
                                                         content={buildContent(
                                                           t.data.node.template[
@@ -383,6 +382,8 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                           ].value
                                                         )}
                                                       >
+                                                    <div>
+
                                                         <TextAreaComponent
                                                           disabled={false}
                                                           editNode={true}
@@ -403,8 +404,9 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                             );
                                                           }}
                                                         />
-                                                      </ShadTooltip>
                                                     </div>
+                                                    </ShadTooltip>
+
                                                   ) : (
                                                     <InputComponent
                                                       editNode={true}
diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx
index 0f9a26f33..ec6d3d07c 100644
--- a/src/frontend/src/modals/codeAreaModal/index.tsx
+++ b/src/frontend/src/modals/codeAreaModal/index.tsx
@@ -40,9 +40,8 @@ export default function CodeAreaModal({
     setOpen(x);
     if (x === false) {
       setTimeout(() => {
-        closePopUp();
         setCloseEdit("editcode");
-        
+        closePopUp();
       }, 300);
     }
   }
diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx
index 6f89e24a6..8223cb3f8 100644
--- a/src/frontend/src/modals/genericModal/index.tsx
+++ b/src/frontend/src/modals/genericModal/index.tsx
@@ -38,11 +38,12 @@ export default function GenericModal({
   const [myValue, setMyValue] = useState(value);
   const { dark } = useContext(darkContext);
   const { setErrorData, setSuccessData } = useContext(alertContext);
-  const { closePopUp } = useContext(PopUpContext);
+  const { closePopUp, setCloseEdit } = useContext(PopUpContext);
   const ref = useRef();
   function setModalOpen(x: boolean) {
     setOpen(x);
     if (x === false) {
+      setCloseEdit("generic");
       closePopUp();
     }
   }