diff --git a/src/components/TagItem.vue b/src/components/TagItem.vue
index 9ae137e72a..862771d9cf 100644
--- a/src/components/TagItem.vue
+++ b/src/components/TagItem.vue
@@ -12,7 +12,7 @@
 			}">
 			{{ translateTagDisplayName(tag) }}
 		</button>
-		<Actions :force-menu="true">
+		<Actions :force-menu="true" @close="closeEditTag">
 			<NcActionButton
 				v-if="renameTagLabel"
 				@click="openEditTag">
@@ -144,6 +144,12 @@ export default {
 			this.editColor = this.tag.color
 		},
 
+		closeEditTag() {
+			this.renameTagInput = false
+			this.renameTagLabel = true
+			this.showSaving = false
+		},
+
 		async renameTag(tag, event) {
 			this.renameTagInput = false
 			this.showSaving = false