diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index f039ca436..36590dedc 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -22,6 +22,7 @@
 										{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
 									</button>
 								</div>
+								<button *ngIf="lockStatus" mat-raised-button disabled class="dataset-save-btn cursor-default" type="button">{{ 'DMP-OVERVIEW.LOCKED' | translate}}</button>
 							</div>
 						</div>
 					</div>
@@ -55,7 +56,8 @@
 									</button>
 								</div>
 								<div class="col-auto d-flex align-items-center">
-									<button *ngIf="(dataset.get('status').value == 0 || isNew) && !lockStatus" mat-raised-button class="dataset-save-btn" type="submit">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
+									<button *ngIf="!lockStatus" mat-raised-button class="dataset-save-btn" type="submit">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
+									<button *ngIf="lockStatus" mat-raised-button disabled class="dataset-save-btn cursor-default" type="button">{{ 'DMP-OVERVIEW.LOCKED' | translate}}</button>
 									<!-- <div *ngIf="!isNew && formGroup.enabled && !lockStatus">
 										<button *ngIf="!isFinalized" mat-raised-button type="submit" class="dataset-save-btn">{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}</button>
 									</div> -->
@@ -79,9 +81,8 @@
 							<li *ngIf="!isNewDataset" (click)="changeStep(2)" [ngClass]="{'active': this.step === 2}">{{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}</li>
 
 							<li *ngFor="let dataset of datasets.controls; let i = index" (click)="changeStep(i + stepsBeforeDatasets, dataset)" [ngClass]="{'active-dataset': this.step === i + stepsBeforeDatasets}">
-								<div>{{'DMP-EDITOR.STEPPER.DATASET' | translate}}
-									<span *ngIf="dataset.value.status === 1"><mat-icon class="status-icon check-icon">check</mat-icon>{{'TYPES.DATASET-STATUS.FINALISED' | translate}}</span>
-								</div>
+								<div>{{'DMP-EDITOR.STEPPER.DATASET' | translate}}</div>
+								<span *ngIf="dataset.value.status === 1" class="finalized-label"><mat-icon class="status-icon check-icon">check</mat-icon>{{'TYPES.DATASET-STATUS.FINALISED' | translate}}</span>
 								<ul class="dataset-list">
 									<li [ngClass]="{'active': this.step === i + stepsBeforeDatasets}">{{ dataset.get('label').value }} (8)</li>
 								</ul>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
index 3442846bf..f99a170e4 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
@@ -379,6 +379,16 @@ a:hover {
 .status-icon {
   font-size: 1.2em;
   color: #a7a7a7;
+  vertical-align: text-top;
+}
+
+.cursor-default {
+  cursor: default;
+}
+
+.finalized-label {
+  font-weight: 400;
+  font-size: 0.875rem;
 }
 
 // ::ng-deep .mat-tab-labels {