diff --git a/e2e/process-services/pages/task-filters-demo.page.ts b/e2e/process-services/pages/task-filters-demo.page.ts
index 357290ba82..35051082ed 100644
--- a/e2e/process-services/pages/task-filters-demo.page.ts
+++ b/e2e/process-services/pages/task-filters-demo.page.ts
@@ -43,7 +43,7 @@ export class TaskFiltersDemoPage {
         return new TaskFiltersPage(this.involvedTask);
     }
 
-    customTaskFilter(filterName: string): TaskFiltersPage {
+      customTaskFilter(filterName: string): TaskFiltersPage {
         return new TaskFiltersPage($(`button[data-automation-id="${filterName}_filter"]`));
     }
 
diff --git a/e2e/process-services/pages/tasks-list.page.ts b/e2e/process-services/pages/tasks-list.page.ts
index f4b8276947..51052e932b 100644
--- a/e2e/process-services/pages/tasks-list.page.ts
+++ b/e2e/process-services/pages/tasks-list.page.ts
@@ -21,6 +21,8 @@ import { browser, $, $$ } from 'protractor';
 export class TasksListPage {
 
     taskList = $('adf-tasklist');
+    selectedTab = $('[data-automation-id="navigation-bar"] .mdc-tab--active .mdc-tab__text-label');
+    taskTab = $$('[data-automation-id="navigation-bar"] .mdc-tab__text-label').first();
     noTasksFound = $$('.adf-empty-content__title').first();
     dataTable = new DataTableComponentPage(this.taskList);
 
@@ -61,4 +63,11 @@ export class TasksListPage {
         return BrowserActions.getText(this.noTasksFound);
     }
 
+    async selectTaskTab() {
+        const currentTab = await BrowserActions.getText(this.selectedTab);
+        if(currentTab && currentTab.toLowerCase().trim() !== 'tasks') {
+            await BrowserActions.click(this.taskTab);
+        }
+    }
+
 }
diff --git a/e2e/process-services/tasks/task-filters-sorting.e2e.ts b/e2e/process-services/tasks/task-filters-sorting.e2e.ts
index 690d0c319d..140bcb5615 100644
--- a/e2e/process-services/tasks/task-filters-sorting.e2e.ts
+++ b/e2e/process-services/tasks/task-filters-sorting.e2e.ts
@@ -95,6 +95,7 @@ describe('Task Filters Sorting', () => {
         await userFiltersUtil.createUserTaskFilter(newFilter);
 
         await browser.refresh();
+        await tasksListPage.selectTaskTab();
         await taskFiltersDemoPage.customTaskFilter(newFilter.name).clickTaskFilter();
 
         expect(await tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name);
diff --git a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.html b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.html
index 55e591c3ca..7373f27f2f 100644
--- a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.html
+++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.html
@@ -33,7 +33,7 @@
                     </mat-error>
                 </mat-form-field>
             </div>
-            <div class="input-row">
+            <div class="adf-input-row">
                 <mat-form-field>
                     <input
                         matInput
diff --git a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
index 563bbe6537..53e7f1074a 100644
--- a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
+++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
@@ -20,7 +20,8 @@
         flex-direction: column;
         display: flex;
 
-        .adf-task-name, .adf-task-description, .input-row {
+        .adf-task-name,
+        .adf-task-description {
             display: flex;
             margin-bottom: 10px;
 
@@ -29,7 +30,7 @@
             }
         }
 
-        .input-row {
+        .adf-input-row {
             @include layout-bp(lt-md) {
                 flex-direction: column;
             }
@@ -94,7 +95,6 @@ adf-start-task {
     }
 
     .adf {
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
         &-start-task-input-container .mat-mdc-text-field-wrapper {
             padding-top: 8px;
         }