diff --git a/src/components/NcRichContenteditable/NcMentionBubble.vue b/src/components/NcRichContenteditable/NcMentionBubble.vue
index 194a3cb82f..26391b19c4 100644
--- a/src/components/NcRichContenteditable/NcMentionBubble.vue
+++ b/src/components/NcRichContenteditable/NcMentionBubble.vue
@@ -83,7 +83,7 @@ export default {
 				: null
 		},
 		mentionText() {
-			return this.id.indexOf(' ') === -1
+			return !this.id.includes(' ') && !this.id.includes('/')
 				? `@${this.id}`
 				: `@"${this.id}"`
 		},
diff --git a/src/mixins/richEditor/index.js b/src/mixins/richEditor/index.js
index 1c02c51451..dbaeaccb3c 100644
--- a/src/mixins/richEditor/index.js
+++ b/src/mixins/richEditor/index.js
@@ -116,7 +116,7 @@ export default {
 			// Fallback to @mention in case no data matches
 			if (!data) {
 				// return `@${value}`
-				return value.indexOf(' ') === -1
+				return !value.includes(' ') && !value.includes('/')
 					? `@${value}`
 					: `@"${value}"`
 			}