diff --git a/e2e/fixtures/tasks.ts b/e2e/fixtures/tasks.ts
index b725994..c9e4308 100644
--- a/e2e/fixtures/tasks.ts
+++ b/e2e/fixtures/tasks.ts
@@ -77,6 +77,16 @@ test('Starting and stopping the task', async (t) => {
   await t.hover(screenTask.buttonStart);
   await t.expect(tooltip.textContent).eql('Start');
   await t.expect(await comparePageScreenshot('start tooltip')).eql(VISUAL_REGRESSION_OK);
+  // Shrink window down to single panel layout, take a screenshot - "Create task" button should not be visible and "Start task" should
+  (await t.getCurrentCDPSession()).Emulation.setDeviceMetricsOverride({
+    width: 800,
+    height: 800,
+    mobile: true,
+    deviceScaleFactor: 1,
+    screenOrientation: { angle: 0, type: 'portraitPrimary' },
+  });
+  await t.expect(await comparePageScreenshot('single panel')).eql(VISUAL_REGRESSION_OK);
+  await (await t.getCurrentCDPSession()).Emulation.clearDeviceMetricsOverride();
   // Start a task with the "Start" button
   await t.click(screenTask.buttonStart);
   // Assert the task is marked as active/running in the task list item and task view title
diff --git a/e2e/visual-regression-screenshots/linux/[Tasks] Starting and stopping the task - single panel.reference.png b/e2e/visual-regression-screenshots/linux/[Tasks] Starting and stopping the task - single panel.reference.png
new file mode 100644
index 0000000..2d0e5da
Binary files /dev/null and b/e2e/visual-regression-screenshots/linux/[Tasks] Starting and stopping the task - single panel.reference.png differ
diff --git a/e2e/visual-regression-screenshots/windows/[Tasks] Starting and stopping the task - single panel.reference.png b/e2e/visual-regression-screenshots/windows/[Tasks] Starting and stopping the task - single panel.reference.png
new file mode 100644
index 0000000..6f13385
Binary files /dev/null and b/e2e/visual-regression-screenshots/windows/[Tasks] Starting and stopping the task - single panel.reference.png differ
diff --git a/src/app/screen-task/screen-task.component.scss b/src/app/screen-task/screen-task.component.scss
index 7acdb9a..69f3936 100644
--- a/src/app/screen-task/screen-task.component.scss
+++ b/src/app/screen-task/screen-task.component.scss
@@ -26,7 +26,6 @@ h2 {
   bottom: var(--fab-offset);
   right: var(--fab-offset);
   left: 50%;
-  z-index: 10;
 }
 .session-tabular-data {
   display: grid;
diff --git a/src/app/screen-tasks/screen-tasks.component.html b/src/app/screen-tasks/screen-tasks.component.html
index 1bc8ae6..f29cf92 100644
--- a/src/app/screen-tasks/screen-tasks.component.html
+++ b/src/app/screen-tasks/screen-tasks.component.html
@@ -21,15 +21,6 @@ <h1>
         }
       }
       @if (tasks.length) {
-        <button
-          [dialogLink]="['tasks', 'create']"
-          mat-fab
-          color="accent"
-          data-e2e="button-add-task"
-          matTooltip="Create a task"
-        >
-          <mat-icon svgIcon="add"></mat-icon>
-        </button>
         <cdk-virtual-scroll-viewport
           #scroll
           [itemSize]="48"
@@ -63,6 +54,15 @@ <h1>
             </a>
           </mat-nav-list>
         </cdk-virtual-scroll-viewport>
+        <button
+          [dialogLink]="['tasks', 'create']"
+          mat-fab
+          color="accent"
+          data-e2e="button-add-task"
+          matTooltip="Create a task"
+        >
+          <mat-icon svgIcon="add"></mat-icon>
+        </button>
       } @else {
         @defer {
           @if (searchOpened() === false) {
diff --git a/src/app/screen-tasks/screen-tasks.component.scss b/src/app/screen-tasks/screen-tasks.component.scss
index 684078e..70fdd5b 100644
--- a/src/app/screen-tasks/screen-tasks.component.scss
+++ b/src/app/screen-tasks/screen-tasks.component.scss
@@ -60,7 +60,6 @@ mat-toolbar {
   bottom: var(--fab-offset);
   right: var(--fab-offset);
   left: 50%;
-  z-index: 10;
 }
 h1 {
   width: 100%;