diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
index fc97ae0ad..2e66c4bce 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
@@ -412,7 +412,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
 		if (!isNullOrUndefined(this.lock)) {
 			this.lockService.unlockTarget(this.datasetWizardModel.id).pipe(takeUntil(this._destroyed)).subscribe(
 				complete => {
-					this.location.back();
+					this.publicMode ? this.router.navigate(['/explore']) : this.router.navigate(['/datasets']);
 				},
 				error => {
 					this.formGroup.get('status').setValue(DmpStatus.Draft);
@@ -421,7 +421,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
 
 			)
 		} else {
-			this.location.back();
+			this.publicMode ? this.router.navigate(['/explore']) : this.router.navigate(['/datasets']);
 		}
 
 	}