diff --git a/src/lib/pages/schedules.svelte b/src/lib/pages/schedules.svelte
index 4aaa0be163..b6d265d8ea 100644
--- a/src/lib/pages/schedules.svelte
+++ b/src/lib/pages/schedules.svelte
@@ -87,14 +87,20 @@
   const onError = (err: APIErrorResponse) => {
     error = err?.body?.message || translate('schedules.error-message-fetching');
   };
+
+  const showFilters = $derived(Number($schedulesCount) > 0 || query);
 </script>
 
 <div class="flex flex-col gap-4">
   <h1 class="flex flex-col gap-0 md:flex-row md:items-center md:gap-2">
     <SchedulesCount />
   </h1>
-  <div class="flex flex-col justify-between gap-2 md:flex-row">
-    {#if Number($schedulesCount) > 0 || query}
+  <div
+    class="flex flex-col gap-2 md:flex-row {showFilters
+      ? 'justify-between'
+      : 'justify-end'}"
+  >
+    {#if showFilters}
       <SearchAttributeFilter
         bind:filters={$scheduleFilters}
         {searchAttributeOptions}
@@ -102,15 +108,15 @@
           refresh = Date.now();
         }}
       />
-      {#if !createDisabled}
-        <Button
-          data-testid="create-schedule"
-          href={routeForScheduleCreate({ namespace })}
-          disabled={!writeActionsAreAllowed()}
-        >
-          {translate('schedules.create')}
-        </Button>
-      {/if}
+    {/if}
+    {#if !createDisabled}
+      <Button
+        data-testid="create-schedule"
+        href={routeForScheduleCreate({ namespace })}
+        disabled={!writeActionsAreAllowed()}
+      >
+        {translate('schedules.create')}
+      </Button>
     {/if}
   </div>
 </div>
diff --git a/tests/e2e/schedules.spec.ts b/tests/e2e/schedules.spec.ts
index 14a203967b..5e0af58ee4 100644
--- a/tests/e2e/schedules.spec.ts
+++ b/tests/e2e/schedules.spec.ts
@@ -23,8 +23,8 @@ test.describe('Schedules Page', () => {
     await scheduleButton.click();
     await expect(page).toHaveURL(/schedules/);
     const createScheduleButton = page.getByTestId('create-schedule');
-    await expect(createScheduleButton).toBeVisible();
-    await createScheduleButton.click();
+    await expect(createScheduleButton.first()).toBeVisible();
+    await createScheduleButton.first().click();
     await expect(page).toHaveURL(/create/);
 
     await page.getByTestId('schedule-name-input').fill('e2e-schedule-1');
diff --git a/tests/integration/disable-write-actions.spec.ts b/tests/integration/disable-write-actions.spec.ts
index 30cb0d5faf..6bb9585d0f 100644
--- a/tests/integration/disable-write-actions.spec.ts
+++ b/tests/integration/disable-write-actions.spec.ts
@@ -51,6 +51,6 @@ test.describe('Disable write actions on empty schedules list actions', () => {
     const namespace = page.locator('h1');
     await expect(namespace).toHaveText('0 Schedules');
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton).toBeDisabled();
+    await expect(createButton.first()).toBeDisabled();
   });
 });
diff --git a/tests/integration/schedule-edit.spec.ts b/tests/integration/schedule-edit.spec.ts
index 11a287efe8..24f36e0eea 100644
--- a/tests/integration/schedule-edit.spec.ts
+++ b/tests/integration/schedule-edit.spec.ts
@@ -21,7 +21,7 @@ test.describe('Schedules List with schedules', () => {
     await page.waitForResponse(SCHEDULES_COUNT_API);
 
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton).toBeEnabled();
+    await expect(createButton.first()).toBeEnabled();
 
     const scheduleLink = page.getByRole('link', { name: /test-schedule/i });
     await expect(scheduleLink).toBeVisible();
diff --git a/tests/integration/schedules-list.spec.ts b/tests/integration/schedules-list.spec.ts
index 1b8b5f3a06..3ff784604e 100644
--- a/tests/integration/schedules-list.spec.ts
+++ b/tests/integration/schedules-list.spec.ts
@@ -22,7 +22,7 @@ test.describe('Schedules List with no schedules', () => {
     await expect(namespace).toHaveText('0 Schedules');
 
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton).toBeEnabled();
+    await expect(createButton.first()).toBeEnabled();
   });
 });