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 7ae258f16..36befcf19 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
@@ -57,10 +57,12 @@
 					<mat-card-content>
 
 						<mat-card-header *ngIf="(fieldset.get('id').value === selectedFieldSetId) && !viewOnly">
-							<mat-icon class="handle" (mousedown)="enableReordering()"
-								style="display:inline-block; margin: 0px auto; cursor: grab;transform: rotate(90deg); opacity: 0.3;">drag_indicator</mat-icon>
+							<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()">
+								<mat-icon class="handle dragpan">drag_indicator</mat-icon>
+							</button>
 						</mat-card-header>
-						<app-description-template-editor-composite-field-component [reorderingMode]="reorderingMode && fieldset.get('id').value === selectedFieldSetId" [form]="fieldset"
+						<app-description-template-editor-composite-field-component [reorderingMode]="reorderingMode" [form]="fieldset"
 							[viewOnly]="viewOnly" [numbering]="numbering + '.'+ (i+1)"
 							[hasFocus]="fieldset.get('id').value === selectedFieldSetId"
 							[datasetProfileId]="datasetProfileId"
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.scss b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.scss
index 0c9215cef..0fe9ab8e9 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.scss
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.scss
@@ -77,4 +77,17 @@ $blue-color-light: #5cf7f2;
   .list-unstyled{
     margin-bottom: 0.2rem;
   }
-}
\ No newline at end of file
+}
+
+.dragpan {
+  transform: rotate(90deg);
+  opacity: 0.3;
+
+  &.enabled-dragpan {
+    display:inline-block; 
+    margin: 0px auto; 
+    cursor: grab;
+    color: var(--secondary-color);
+    opacity: 0.6 !important;
+  }
+}