diff --git a/components/calendar/input/EventCategories.vue b/components/calendar/input/EventCategories.vue
index 13b42fc..faf989e 100644
--- a/components/calendar/input/EventCategories.vue
+++ b/components/calendar/input/EventCategories.vue
@@ -35,6 +35,8 @@ const filteredCategories = computed(() =>
       <UiButton
         variant="outline"
         role="combobox"
+        :aria-expanded="isPopoverOpen"
+        aria-controls="event-categories"
         class="relative w-full max-w-full h-fit justify-between"
       >
         <template v-if="!model.length">
@@ -54,12 +56,13 @@ const filteredCategories = computed(() =>
       </UiButton>
     </UiPopoverTrigger>
     <UiPopoverContent
+      id="event-categories"
       align="start"
       side="bottom"
       :collision-padding="50"
       class="w-fit h-[33vh] p-0"
     >
-      <UiCommand v-model="modelBuffer" v-model:searchTerm="searchTerm" :multiple="true">
+      <UiCommand v-model="modelBuffer" v-model:search-term="searchTerm" :multiple="true">
         <UiCommandInput :placeholder="$t('entity.category.search')" />
         <UiCommandEmpty>{{ $t('entity.category.notFoundAny') }}</UiCommandEmpty>
         <UiCommandList>
diff --git a/components/calendar/input/EventCategory.vue b/components/calendar/input/EventCategory.vue
index 941ad21..6e8dde5 100644
--- a/components/calendar/input/EventCategory.vue
+++ b/components/calendar/input/EventCategory.vue
@@ -34,6 +34,8 @@ const filteredCategories = computed(() =>
       <UiButton
         variant="outline"
         role="combobox"
+        :aria-expanded="isPopoverOpen"
+        aria-controls="event-category"
         class="w-full max-w-full justify-between"
       >
         <template v-if="!model">
@@ -52,6 +54,7 @@ const filteredCategories = computed(() =>
       </UiButton>
     </UiPopoverTrigger>
     <UiPopoverContent
+      id="event-category"
       align="start"
       side="bottom"
       :collision-padding="50"