diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/word-list/dataset-profile-editor-word-list-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/word-list/dataset-profile-editor-word-list-field.component.html
index 12d82cae4..58ea62fb2 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/word-list/dataset-profile-editor-word-list-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/word-list/dataset-profile-editor-word-list-field.component.html
@@ -30,7 +30,7 @@
 				<input matInput [formControl]="form.get('data').get('options').get(''+i).get('value')">
 			</mat-form-field>
 			<button mat-icon-button class="col-auto" (click)="deleteRow(i)" type="button"
-				[disabled]="this.form.disabled">
+				[disabled]="form.get('data').get('options').get(''+i).get('label').disabled || form.get('data').get('options').get(''+i).get('value').disabled">
 				<mat-icon>delete</mat-icon>
 			</button>
 		</div>
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
index 471e5623b..80d8606c0 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
@@ -52,7 +52,7 @@
 				</div>
 			</div>
 			<div *ngIf="showDelete" class="col-auto align-self-center">
-				<button mat-icon-button type="button" class="deleteBtn" (click)="deleteCompositeField();">
+				<button mat-icon-button type="button" class="deleteBtn" (click)="deleteCompositeField();" [disabled]="form.disabled">
 					<mat-icon>delete</mat-icon>
 				</button>
 			</div>
diff --git a/dmp-frontend/src/assets/resources/skipDisable.json b/dmp-frontend/src/assets/resources/skipDisable.json
index c791c76b3..61fc34953 100644
--- a/dmp-frontend/src/assets/resources/skipDisable.json
+++ b/dmp-frontend/src/assets/resources/skipDisable.json
@@ -9,9 +9,6 @@
 	"FieldSetEditorModel.extendedDescription",
 	"FieldSetEditorModel.additionalInformation",
 	"TextAreaFieldDataEditorModel.label",
-	"FreeTextFieldDataEditorModel.label",
-	"WordListFieldDataEditorModel.label",
-	"FieldDataOptionEditorModel.label",
 	"FieldSetEditorModel.schematics",
 	"FieldSetEditorModel.export"
 ]