diff --git a/src/components/ui/AppSelect.vue b/src/components/ui/AppSelect.vue
index 2b0232f7e..133417dfb 100644
--- a/src/components/ui/AppSelect.vue
+++ b/src/components/ui/AppSelect.vue
@@ -49,12 +49,10 @@ const indicator = ui?.indicator ?? 'absolute left-1.5 inline-flex items-center j
 
 <template>
   <SelectRoot v-model="modelValue">
-    <Tip :label="label" :disabled="!label">
-      <SelectTrigger v-test-id="testId" :class="select.trigger">
-        <SelectValue :placeholder="placeholder" />
-        <icon-lucide-chevron-down class="ml-1 size-3 shrink-0 text-muted" />
-      </SelectTrigger>
-    </Tip>
+    <SelectTrigger v-test-id="testId" :class="select.trigger" :aria-label="label" :title="label">
+      <SelectValue :placeholder="placeholder" />
+      <icon-lucide-chevron-down class="ml-1 size-3 shrink-0 text-muted" />
+    </SelectTrigger>
     <SelectPortal>
       <SelectContent position="popper" :side-offset="2" :class="select.content">
         <SelectViewport :class="viewport">
diff --git a/tests/e2e/export/basic.spec.ts b/tests/e2e/export/basic.spec.ts
index 2add06c82..297accf79 100644
--- a/tests/e2e/export/basic.spec.ts
+++ b/tests/e2e/export/basic.spec.ts
@@ -104,13 +104,14 @@ test('remove export row decreases row count', async () => {
 
 test('format selector changes to JPG', async () => {
   const formatTrigger = exportItems().first().getByTestId('app-select-trigger').last()
-  await formatTrigger.hover()
-  await expect(page.locator('[role=tooltip]').filter({ hasText: 'Export format' })).toBeVisible()
+  await expect(formatTrigger).toHaveAttribute('aria-label', 'Export format')
   await formatTrigger.click()
-  await expect(page.locator('[role=tooltip]').filter({ hasText: 'Export format' })).toHaveCount(0)
+
+  for (const label of ['PNG', 'JPG', 'WEBP', 'SVG', 'PDF']) {
+    await expect(page.locator('[role="option"]').filter({ hasText: label })).toBeVisible()
+  }
 
   const jpgOption = page.locator('[role="option"]').filter({ hasText: 'JPG' })
-  await expect(jpgOption).toBeVisible()
   await expectInViewport(page, jpgOption)
   await jpgOption.click()
   await canvas.waitForRender()