diff --git a/apps/systemtags/src/components/SystemTagPicker.vue b/apps/systemtags/src/components/SystemTagPicker.vue
index e17fb1a7bc5..1091f4c93d6 100644
--- a/apps/systemtags/src/components/SystemTagPicker.vue
+++ b/apps/systemtags/src/components/SystemTagPicker.vue
@@ -51,9 +51,10 @@
 					<!-- Color picker -->
 					<NcColorPicker :data-cy-systemtags-picker-tag-color="tag.id"
 						:value="`#${tag.color}`"
-						:shown.sync="openedPicker"
+						:shown="openedPicker === tag.id"
 						class="systemtags-picker__tag-color"
 						@update:value="onColorChange(tag, $event)"
+						@update:shown="openedPicker = $event ? tag.id : false"
 						@submit="openedPicker = false">
 						<NcButton :aria-label="t('systemtags', 'Change tag color')" type="tertiary">
 							<template #icon>
@@ -210,7 +211,7 @@ export default defineComponent({
 		return {
 			status: Status.BASE,
 			opened: true,
-			openedPicker: false,
+			openedPicker: false as number | false,
 
 			input: '',
 			tags: [] as TagWithId[],