diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index 7b4c09b46c..8ab114e87f 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -42,4 +42,4 @@ jobs:
           mkdir frontend/build && cd backend && touch
           windmill-api/openapi-deref.yaml &&
           DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill cargo
-          --features enterprise test --all -- --nocapture
+          test --all --features enterprise -- --nocapture
diff --git a/frontend/src/lib/components/WorkspaceGroup.svelte b/frontend/src/lib/components/WorkspaceGroup.svelte
index f18a03cbb3..20dd6c3f93 100644
--- a/frontend/src/lib/components/WorkspaceGroup.svelte
+++ b/frontend/src/lib/components/WorkspaceGroup.svelte
@@ -17,6 +17,7 @@
 				dedicated_worker?: string
 				worker_tags?: string[]
 		  }
+	export let top: boolean
 
 	let nconfig: any = config
 		? config.worker_tags != undefined || config.dedicated_worker != undefined
@@ -76,7 +77,7 @@
 	><h4 class="py-4 truncate w-40">{name}</h4>
 	{#if $superadmin}
 		<Popup
-			floatingConfig={{ strategy: 'absolute', placement: 'bottom-end' }}
+			floatingConfig={{ strategy: 'absolute', placement: top ? 'top-start' : 'bottom-start' }}
 			containerClasses="border rounded-lg shadow-lg p-4 bg-surface"
 		>
 			<svelte:fragment slot="button">
diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
index 7493006f34..dc5e98c5a1 100644
--- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
@@ -258,8 +258,9 @@
 				</div>
 			{/if}</div
 		>
-		{#each groupedWorkers as worker_group}
+		{#each groupedWorkers as worker_group, i}
 			<WorkspaceGroup
+				top={i != 0}
 				name={worker_group[0]}
 				config={(workerGroups ?? {})[worker_group[0]]}
 				on:reload={() => {
@@ -332,8 +333,11 @@
 			<div class="pb-4" />
 		{/each}
 
-		{#each Object.entries(workerGroups ?? {}).filter((x) => !groupedWorkers.some((y) => y[0] == x[0])) as worker_group}
+		<div class="pb-4" />
+
+		{#each Object.entries(workerGroups ?? {}).filter((x) => !groupedWorkers.some((y) => y[0] == x[0])) as worker_group, i}
 			<WorkspaceGroup
+				top={i != 0 || groupedWorkers?.length > 0}
 				on:reload={() => {
 					loadWorkerGroups()
 				}}