diff --git a/src/components/ComboBox.vue b/src/components/ComboBox.vue
index dec36ed745669e86160533a5227576c75cce5b5c..c75f0f4f4ce04e071ebe39d6c5c340ee35ee179d 100644
--- a/src/components/ComboBox.vue
+++ b/src/components/ComboBox.vue
@@ -225,6 +225,13 @@ watchEffect(() => {
   activeIndex.value = clamp(activeIndex.value, 0, lastChoiceIndex.value)
 })
 
+watch(
+  () => props.choices,
+  () => {
+    activeIndex.value = 0
+  },
+)
+
 watch(hasFocus, (hasFocus, hadFocus) => {
   if (hasFocus && !hadFocus) {
     open()