diff --git a/frontend/src/app/components/alerts/Alert.jsx b/frontend/src/app/components/alerts/Alert.jsx
index 19f160e..e3342e4 100644
--- a/frontend/src/app/components/alerts/Alert.jsx
+++ b/frontend/src/app/components/alerts/Alert.jsx
@@ -9,6 +9,9 @@ const Alert = (props) => {
     setHide(true);
     setTimeout(() => {
       props.setTriggerAlert(false);
+      if (props?.editState) {
+        props?.setEditState(false);
+      }
     }, 250);
   };
   return (
@@ -32,7 +35,6 @@ const Alert = (props) => {
           <PrimaryButton
             text="Confirm"
             onClick={() => {
-              props?.setEditState(false);
               handleHide();
             }}
           />
diff --git a/frontend/src/app/components/topHeader/TopHeader.jsx b/frontend/src/app/components/topHeader/TopHeader.jsx
index b8e07f4..1971e84 100644
--- a/frontend/src/app/components/topHeader/TopHeader.jsx
+++ b/frontend/src/app/components/topHeader/TopHeader.jsx
@@ -40,6 +40,7 @@ const TopHeader = (props) => {
           setEditState={setEditState}
           title={!editState ? props.topbarTitle : "Save Changes"}
           body="You are about to save the changes. Do you want to continue?"
+          editState={editState}
         />
       )}
       <div className={styles.container}>