diff --git a/demo-shell/src/app/components/process-service/process-service.component.html b/demo-shell/src/app/components/process-service/process-service.component.html
index da2460cedc..ed0bd1a52d 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.html
+++ b/demo-shell/src/app/components/process-service/process-service.component.html
@@ -30,6 +30,14 @@
                 </div>
                 <div class="adf-grid-item adf-tasks-list" fxFlex.gt-md="380px" [ngClass.gt-md]="{'small-pagination': true}"
                      *ngIf="taskFilter && !isStartTaskMode()">
+                     <mat-slide-toggle
+                        class="adf-task-details-toggle"
+                        id="showHeaderToggle"
+                        [color]="'primary'"
+                        (change)="toggleHeaderContent()"
+                        [checked]="showHeaderContent">
+                        {{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
+                    </mat-slide-toggle>
                     <adf-tasklist
                         [appId]="taskFilter?.appId"
                         [presetColumn]="presetColumn"
@@ -67,6 +75,7 @@
                                            [debugMode]="true"
                                            [taskId]="currentTaskId"
                                            [fieldValidators]="fieldValidators"
+                                           [showHeaderContent]="showHeaderContent"
                                            (formCompleted)="onFormCompleted($event)"
                                            (formContentClicked)="onContentClick($event)"
                                            (taskCreated)="onTaskCreated($event)"
diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts
index e745f9ae28..29bea6916f 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.ts
+++ b/demo-shell/src/app/components/process-service/process-service.component.ts
@@ -126,6 +126,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
     processPage = 0;
     paginationPageSize = 0;
     processSchemaColumns: any[] = [];
+    showHeaderContent = true;
 
     defaultProcessDefinitionName: string;
     defaultProcessName: string;
@@ -243,6 +244,10 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
         this.taskPage = 0;
     }
 
+    toggleHeaderContent(): void {
+        this.showHeaderContent = !this.showHeaderContent;
+    }
+
     onTabChange(event: any): void {
         const index = event.index;
         if (index === TASK_ROUTE) {
diff --git a/lib/process-services/task-list/components/task-details.component.html b/lib/process-services/task-list/components/task-details.component.html
index f57f8841cd..96721c271a 100644
--- a/lib/process-services/task-list/components/task-details.component.html
+++ b/lib/process-services/task-list/components/task-details.component.html
@@ -15,15 +15,6 @@
         </h2>
     </div>
 
-    <mat-slide-toggle
-        class="adf-task-details-toggle"
-        id="showHeaderToggle"
-        [color]="'primary'"
-        (change)="toggleHeaderContent()"
-        [checked]="showHeaderContent">
-        {{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
-    </mat-slide-toggle>
-
     <div class="adf-task-details-core"
         fxLayout="column"
         fxLayoutGap="8px"
diff --git a/lib/process-services/task-list/components/task-details.component.ts b/lib/process-services/task-list/components/task-details.component.ts
index 2cba3c0e4f..7222c24bcb 100644
--- a/lib/process-services/task-list/components/task-details.component.ts
+++ b/lib/process-services/task-list/components/task-details.component.ts
@@ -455,10 +455,6 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
         this.loadDetails(taskId);
     }
 
-    toggleHeaderContent(): void {
-        this.showHeaderContent = !this.showHeaderContent;
-    }
-
     isCompletedTask(): boolean {
         return this.taskDetails && this.taskDetails.endDate ? true : undefined;
     }