diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
index 36befcf19..197ce50cf 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
@@ -56,9 +56,10 @@
 					[ngClass]="{'field-container-active': fieldset.get('id').value === selectedFieldSetId}">
 					<mat-card-content>
 
-						<mat-card-header *ngIf="(fieldset.get('id').value === selectedFieldSetId) && !viewOnly">
+						<!-- <mat-card-header *ngIf="(fieldset.get('id').value === selectedFieldSetId) && !viewOnly"> -->
+						<mat-card-header *ngIf="!viewOnly">
 							<mat-icon *ngIf="reorderingMode" class="handle dragpan enabled-dragpan">drag_indicator</mat-icon>
-							<button mat-icon-button class="ml-auto mr-auto" *ngIf="!reorderingMode" (click)="enableReordering()">
+							<button mat-icon-button class="ml-auto mr-auto" *ngIf="!reorderingMode && (fieldset.get('id').value === selectedFieldSetId)" (click)="enableReordering()">
 								<mat-icon class="handle dragpan">drag_indicator</mat-icon>
 							</button>
 						</mat-card-header>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.ts
index dfee0dbf1..ea96e861a 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.ts
@@ -53,7 +53,7 @@ export class DescriptionTemplateEditorSectionFieldSetComponent implements OnInit
 		this.dragulaService.createGroup(this.FIELDSETS, {
 			moves: (el, container, handle) => {
 				// if(this.viewOnly) return false; //uncomment if want to unable drag n drop in viewonly mode
-				if (el.id != (this.dragula_prefix + this.tocentry.id)) return false;
+				// if (el.id != (this.dragula_prefix + this.tocentry.id)) return false;
 				if (handle.className && handle.classList.contains('handle')) return true;
 				return false;
 			}
@@ -67,13 +67,14 @@ export class DescriptionTemplateEditorSectionFieldSetComponent implements OnInit
 
 
 			// obs.
+			
 			this.dataNeedsRefresh.emit();
 			return;
 		}));
 
 		this.subs.add(this.dragulaService.dragend(this.FIELDSETS).subscribe(({ el }) => {
 			this.exitReordering();
-		}))
+		}));
 
 		const initializerSub = this.initializer
 			.pipe(