diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index 5c3839e8b..51bdd3dfb 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -16,7 +16,7 @@
 			<div class="col-10 gray-container" >
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
-					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="0" [checked]="status == 0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
index 708c4c574..c25d3a896 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
@@ -43,6 +43,7 @@ import { DatasetService } from '../../../../core/services/dataset/dataset.servic
 export class DatasetCriteriaComponent extends BaseCriteriaComponent implements OnInit {
 
 	@Input() dmpSearchEnabled;
+	@Input() status;
 	public criteria: any;
 	public filteringTagsAsync = false;
 	public filteredTags: ExternalSourceItemModel[];
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index c9889f88f..e92a69879 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -15,7 +15,7 @@
 			<div class="card-body table-responsive">
 				<div class="listing row">
 					<div class="col-3">
-						<app-dataset-criteria-component class="col-auto"></app-dataset-criteria-component>
+						<app-dataset-criteria-component [status]="status" class="col-auto"></app-dataset-criteria-component>
 					</div>
 					<div class="col-9">
 						<div *ngFor="let item of listingItems; let i = index">
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
index 705f03cf3..0cd581f27 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
@@ -81,8 +81,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 
 				if (this.status != null && this.status == DatasetStatus.Draft) {
 					this.criteria.setCriteria(this.getDraftCriteria());
-					this.refresh();
 					this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
+					this.refresh();
 				}
 			});
 	}