diff --git a/src/components/AppNavigation/CalendarList/CalendarListItem.vue b/src/components/AppNavigation/CalendarList/CalendarListItem.vue
index fee0ee0c5d..7fc13ecd30 100644
--- a/src/components/AppNavigation/CalendarList/CalendarListItem.vue
+++ b/src/components/AppNavigation/CalendarList/CalendarListItem.vue
@@ -8,15 +8,16 @@
 		:aria-description="descriptionAppNavigationItem"
 		:name="calendarDisplayName || $t('calendar', 'Untitled calendar')"
 		:class="{deleted: isBeingDeleted, disabled: !calendar.enabled}"
-		@click.prevent.stop="toggleEnabled"
 		@update:menuOpen="actionsMenuOpen = $event">
 		<template #icon>
 			<CheckboxMarked v-if="calendar.enabled"
 				:size="20"
-				:fill-color="calendar.color" />
+				:fill-color="calendar.color"
+				@click.prevent.stop="toggleEnabled" />
 			<CheckboxBlank v-else
 				:size="20"
-				:fill-color="calendar.color" />
+				:fill-color="calendar.color"
+				@click.prevent.stop="toggleEnabled" />
 		</template>
 
 		<template #counter>
diff --git a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
index dde60f6936..374eaaaa8e 100644
--- a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
+++ b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
@@ -6,12 +6,9 @@
 <template>
 	<AppNavigationItem :loading="calendar.loading"
 		:name="calendar.displayName || $t('calendar', 'Untitled calendar')"
-		:menu-open.sync="menuOpen"
-		@click.prevent.stop="toggleEnabled">
+		:menu-open.sync="menuOpen">
 		<template #icon>
-			<AppNavigationIconBullet v-if="calendar.enabled"
-				:color="calendar.color"
-				@click.prevent.stop="toggleEnabled" />
+			<AppNavigationIconBullet :color="calendar.color" />
 		</template>
 
 		<template #counter>