diff --git a/packages/@headlessui-vue/src/utils/calculate-active-index.ts b/packages/@headlessui-vue/src/utils/calculate-active-index.ts index bed4d6a..805ef23 100644 --- a/packages/@headlessui-vue/src/utils/calculate-active-index.ts +++ b/packages/@headlessui-vue/src/utils/calculate-active-index.ts @@ -48,6 +48,9 @@ export function calculateActiveIndex( } case Focus.Previous: { + // If nothing is active, focus the last relevant item + if (activeIndex === -1) activeIndex = items.length + for (let i = activeIndex - 1; i >= 0; --i) { if (!resolvers.resolveDisabled(items[i], i, items)) { return i