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 394572d7f..6e118bf68 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
@@ -84,7 +84,7 @@
 						</div>
 						<div *ngIf="isNew">
 							<button mat-raised-button color="primary" (click)="cancelCreation()" type="button"
-								class="lightblue-btn text-uppercase mr-2">
+								class="text-uppercase mr-2">
 								{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
 							</button>
 						</div>
@@ -95,12 +95,12 @@
 										</button>
 									</div> -->
 						<div *ngIf="this.formGroup.enabled">
-							<button mat-raised-button color="primary" type="submit"
-								class="lightblue-btn text-uppercase mr-2">{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
+							<button mat-raised-button color="primary" type="submit"	[disabled]="!formGroup.valid" class="text-uppercase mr-2">
+								{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
 							</button>
 						</div>
 						<div *ngIf="this.formGroup.enabled">
-							<button type="button" mat-raised-button color="primary" class="lightblue-btn text-uppercase"
+							<button type="button" mat-raised-button color="primary" [disabled]="!formGroup.valid" class="text-uppercase mr-2"
 								(click)="saveAndFinalize()">{{'DMP-EDITOR.ACTIONS.FINALISE' | translate}}
 							</button>
 						</div>