diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
index 2d63ed9597669c46a87a0fe766ac49102b8f3586..5814fa5705cadb94ea716f6e57ca00daaf4f4109 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
@@ -332,7 +332,7 @@ export class CycleEdit extends Component {
                 .then(async (cycle) => { 
                     if (cycle && this.state.cycle.updated_at !== cycle.updated_at) {
                         this.saveCycleQuota(cycle);
-                        this.props.history.length>2 && this.props.history.go(-2);
+                        this.props.history.length>2 && this.state.isDirty? this.props.history.go(-2):this.props.history.go(-1);
                     }   else {
                         this.growl.show({severity: 'error', summary: 'Error Occured', detail: 'Unable to update Cycle'});
                         //this.setState({errors: cycle});
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
index bad5ca428d5334570ca590c79ee96e1909f28166..95310e6d147bae5c019acecd80a54724e3864a4d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -385,7 +385,7 @@ export class ProjectEdit extends Component {
                         project.archive_location = archive_location;
                         project.archiveId = archiveId;
                         this.saveProjectQuota(project);
-                        this.props.history.length>2 && this.props.history.go(-2);
+                        this.props.history.length>2 && this.state.isDirty? this.props.history.go(-2):this.props.history.go(-1);
                     }   else {
                         this.growl.show({severity: 'error', summary: 'Error Occured', detail: 'Unable to update Project'});
                         this.setState({errors: project});