diff --git a/src/frontend/src/components/codeAreaComponent/index.tsx b/src/frontend/src/components/codeAreaComponent/index.tsx
index e8c1319f9..f34a105dc 100644
--- a/src/frontend/src/components/codeAreaComponent/index.tsx
+++ b/src/frontend/src/components/codeAreaComponent/index.tsx
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useState } from "react";
 import { PopUpContext } from "../../contexts/popUpContext";
-import CodeAreaModal from "../../modals/codeAreaModal";
+import CodeAreaModal from "../../modals/codeAreaModal/v2";
 import TextAreaModal from "../../modals/textAreaModal";
 import { CodeAreaComponentType, TextAreaComponentType } from "../../types/components";
 
diff --git a/src/frontend/src/modals/codeAreaModal/v2.tsx b/src/frontend/src/modals/codeAreaModal/v2.tsx
index 52a564d06..34521b993 100644
--- a/src/frontend/src/modals/codeAreaModal/v2.tsx
+++ b/src/frontend/src/modals/codeAreaModal/v2.tsx
@@ -109,7 +109,7 @@ export default function CodeAreaModal({
   const tabs = [{ name: "code" }, { name: "errors" }]
 
   return (
-    <TwoColumnsModal open={open} setOpen={setOpen}>
+    <TwoColumnsModal open={true} setOpen={setOpen}>
         <TwoColumnsModal.Header description={CODE_PROMPT_DIALOG_SUBTITLE}>{"A"}</TwoColumnsModal.Header>
         <TwoColumnsModal.First>{"A"}</TwoColumnsModal.First>
         <TwoColumnsModal.Second>{"B"}</TwoColumnsModal.Second>
diff --git a/src/frontend/src/modals/twoColumnsModal/index.tsx b/src/frontend/src/modals/twoColumnsModal/index.tsx
index f91626a27..86f58403e 100644
--- a/src/frontend/src/modals/twoColumnsModal/index.tsx
+++ b/src/frontend/src/modals/twoColumnsModal/index.tsx
@@ -1,4 +1,4 @@
-import { ReactNode, useEffect, useRef } from "react";
+import { ReactNode, useContext, useEffect, useRef } from "react";
 
 import _ from "lodash";
 import {
@@ -10,6 +10,7 @@ import {
     DialogTrigger,
 } from "../../components/ui/dialog";
 import React from "react";
+import { PopUpContext } from "../../contexts/popUpContext";
 
 type FirstProps = {children:ReactNode};
 type SecondProps = {children:ReactNode};
@@ -48,14 +49,17 @@ function TwoColumnsModal({
     setOpen,
     children,
 }: TwoColumnsModalProps) {
-    const isOpen = useRef(open);
-    useEffect(() => {
-        isOpen.current = open;
-    }, [open]);
+   const {closePopUp, setCloseEdit} = useContext(PopUpContext)
 
     function setModalOpen(x: boolean) {
         setOpen(x);
-    }
+        if (x === false) {
+          setTimeout(() => {
+            setCloseEdit("editcode");
+            closePopUp();
+          }, 300);
+        }
+      }
     const firstChild = React.Children.toArray(children).find(
         (child) => (child as React.ReactElement).type === First
     );