diff --git a/frontend/src/lib/components/flows/map/FlowJobsMenu.svelte b/frontend/src/lib/components/flows/map/FlowJobsMenu.svelte
index 25405e117b..9699805e30 100644
--- a/frontend/src/lib/components/flows/map/FlowJobsMenu.svelte
+++ b/frontend/src/lib/components/flows/map/FlowJobsMenu.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import Menu from '$lib/components/common/menu/MenuV2.svelte'
+	import { Menu, Menubar } from '$lib/components/meltComponents/index'
+	import { melt } from '@melt-ui/svelte'
 	import { createEventDispatcher } from 'svelte'
 	import { ListFilter, Lock, LockOpen } from 'lucide-svelte'
-	import { MenuItem } from '@rgossiaux/svelte-headlessui'
 	import Popover from '$lib/components/Popover.svelte'
+	import { twMerge } from 'tailwind-merge'
 
 	const dispatch = createEventDispatcher()
 
@@ -23,21 +24,31 @@
 			filter > 0
 		) {
 			event.preventDefault()
-			dispatch('selectedIteration', { index: filter - 1, id: flowJobs[filter - 1], manuallySet: true })
+			dispatch('selectedIteration', {
+				index: filter - 1,
+				id: flowJobs[filter - 1],
+				manuallySet: true
+			})
+			menu?.close()
 		}
 	}
 
 	let buttonHover = false
+	let menu: Menu | undefined = undefined
 </script>
 
 {#if selectedManually && flowJobsSuccess?.some((x) => x == undefined || x == null)}
 	<Popover class="absolute top-1.5 right-12 cursor-pointer">
 		<!-- svelte-ignore a11y-click-events-have-key-events -->
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
-		<div on:mouseenter={() => (buttonHover = true)} on:mouseleave={() => (buttonHover = false)} on:click={(e) => {
+		<div
+			on:mouseenter={() => (buttonHover = true)}
+			on:mouseleave={() => (buttonHover = false)}
+			on:click={(e) => {
 				buttonHover = false
-				dispatch('selectedIteration', { manuallySet: false })}
-			}>
+				dispatch('selectedIteration', { manuallySet: false })
+			}}
+		>
 			{#if buttonHover}
 				<LockOpen class="text-primary" size={14} />
 			{:else}
@@ -50,45 +61,50 @@
 	</Popover>
 {/if}
 
-<Menu  maxHeight={300}>
-	<div slot="trigger">
-		<button
-			title="Pick an iteration"
-			id={`flow-editor-iteration picker-${id}`}
-			type="button"
-			class=" text-xs bg-surface border-[1px] border-gray-300 dark:border-gray-500 focus:outline-none
-		hover:bg-surface-hover focus:ring-4 focus:ring-surface-selected font-medium rounded-sm w-[40px] gap-1 h-[20px]
-		flex items-center justify-center {flowJobsSuccess?.[selected] == false
-				? 'text-red-400'
-				: 'text-secondary'}"
-		>
-			#{selected == -1 ? '?' : selected + 1}
-			<ListFilter size={15} />
-		</button>
-	</div>
+<Menubar let:createMenu>
+	<Menu {createMenu} let:item placement="bottom-center" bind:this={menu}>
+		<svelte:fragment slot="trigger" let:trigger>
+			<button
+				title="Pick an iteration"
+				id={`flow-editor-iteration picker-${id}`}
+				type="button"
+				class={twMerge(
+					'text-xs bg-surface border-[1px] border-gray-300 dark:border-gray-500 focus:outline-none',
+					'hover:bg-surface-hover focus:ring-4 focus:ring-surface-selected font-medium rounded-sm w-[40px] gap-1 h-[20px]',
+					'flex items-center justify-center',
+					flowJobsSuccess?.[selected] == false ? 'text-red-400' : 'text-secondary'
+				)}
+				use:melt={trigger}
+			>
+				#{selected == -1 ? '?' : selected + 1}
+				<ListFilter size={15} />
+			</button>
+		</svelte:fragment>
 
-	<MenuItem disabled>
-		<input type="number" bind:value={filter} on:keydown={onKeydown} />
-	</MenuItem>
-	{#each flowJobs ?? [] as id, idx (id)}
-		{#if filter == undefined || (idx + 1).toString().includes(filter.toString())}
-			<MenuItem>
-				<button
-					class="text-primary text-xs w-full text-left py-1 pl-2 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center {flowJobsSuccess?.[
-						idx
-					] == false
-						? 'text-red-400'
-						: ''}"
-					on:pointerdown={() => {
-						//close()
-						dispatch('selectedIteration', { index: idx, id, manuallySet: true })
-					}}
-					role="menuitem"
-					tabindex="-1"
-				>
-					#{idx + 1}
-				</button>
-			</MenuItem>
-		{/if}
-	{/each}
-</Menu>
+		<div class="flex flex-col px-1">
+			<input type="number" bind:value={filter} on:keydown={onKeydown} />
+
+			<div class="overflow-y-auto max-h-[300px]">
+				{#each flowJobs ?? [] as id, idx (id)}
+					{#if filter == undefined || (idx + 1).toString().includes(filter.toString())}
+						<button
+							class={twMerge(
+								'text-primary text-xs w-full text-left py-1 pl-2 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center',
+								flowJobsSuccess?.[idx] == false ? 'text-red-400' : '',
+								'data-[highlighted]:bg-surface-hover'
+							)}
+							on:click={() => {
+								dispatch('selectedIteration', { index: idx, id, manuallySet: true })
+							}}
+							role="menuitem"
+							tabindex="-1"
+							use:melt={item}
+						>
+							#{idx + 1}
+						</button>
+					{/if}
+				{/each}
+			</div>
+		</div>
+	</Menu>
+</Menubar>
diff --git a/frontend/src/lib/components/meltComponents/Menu.svelte b/frontend/src/lib/components/meltComponents/Menu.svelte
index a63de65874..44a96cae7f 100644
--- a/frontend/src/lib/components/meltComponents/Menu.svelte
+++ b/frontend/src/lib/components/meltComponents/Menu.svelte
@@ -31,6 +31,10 @@
 
 	const sync = createSync(states)
 	$: sync.open(open, (v) => (open = Boolean(v)))
+
+	export function close() {
+		open = false
+	}
 </script>
 
 <div class="w-full h-8">
diff --git a/frontend/src/lib/components/meltComponents/index.ts b/frontend/src/lib/components/meltComponents/index.ts
new file mode 100644
index 0000000000..19712b5f77
--- /dev/null
+++ b/frontend/src/lib/components/meltComponents/index.ts
@@ -0,0 +1,2 @@
+export { default as Menu } from './Menu.svelte'
+export { default as Menubar } from './Menubar.svelte'