diff --git a/packages/ui/src/components/emoji/utils.ts b/packages/ui/src/components/emoji/utils.ts
index eb4ae67380..f996148e69 100644
--- a/packages/ui/src/components/emoji/utils.ts
+++ b/packages/ui/src/components/emoji/utils.ts
@@ -26,11 +26,11 @@ import type { EmojiWithGroup, EmojiHierarchy } from '.'
 export const emojiRegex = EMOJI_REGEX
 export const emojiGlobalRegex = new RegExp(EMOJI_REGEX.source, EMOJI_REGEX.flags + 'g')
 
-export const emoticonRegex = EMOTICON_REGEX
-export const emoticonGlobalRegex = new RegExp(EMOTICON_REGEX.source, EMOTICON_REGEX.flags + 'g')
+export const emoticonRegex = new RegExp(`(?:^|\\s)(${EMOTICON_REGEX.source})$`)
+export const emoticonGlobalRegex = new RegExp(`(?<!\\S)${EMOTICON_REGEX.source}(?!\\S)`, EMOTICON_REGEX.flags + 'g')
 
-export const shortcodeRegex = SHORTCODE_REGEX
-export const shortcodeGlobalRegex = new RegExp(SHORTCODE_REGEX.source, SHORTCODE_REGEX.flags + 'g')
+export const shortcodeRegex = new RegExp(`(?:^|\\s)(${SHORTCODE_REGEX.source})$`)
+export const shortcodeGlobalRegex = new RegExp(`(?<!\\S)${SHORTCODE_REGEX.source}(?!\\S)`, SHORTCODE_REGEX.flags + 'g')
 
 let availableEmojis: Emoji[]
 
@@ -82,12 +82,9 @@ export async function updateEmojis (lang?: string): Promise<void> {
 }
 
 export function getEmojiForShortCode (shortcode: string | undefined): string | undefined {
-  console.log('getEmojiForShortCode', shortcode)
+  shortcode = shortcode?.slice(1, -1)
   if (shortcode === undefined) return undefined
-  shortcode = shortcode.slice(1, -1)
-  console.log(shortcode)
   const result = availableEmojis.find(e => e.shortcodes?.includes(shortcode))
-  console.log(result)
   return result === undefined ? undefined : result.emoji
 }
 
diff --git a/plugins/text-editor-resources/src/components/extension/emoji.ts b/plugins/text-editor-resources/src/components/extension/emoji.ts
index be9635afd3..d7ebfe33e7 100644
--- a/plugins/text-editor-resources/src/components/extension/emoji.ts
+++ b/plugins/text-editor-resources/src/components/extension/emoji.ts
@@ -28,7 +28,7 @@ function handleEmoji (
   range: Range,
   match: ExtendedRegExpMatchArray,
   commands: SingleCommands,
-  getEmojiFunction: (emoticon: string | undefined) => string | undefined
+  getEmojiFunction: (key: string | undefined) => string | undefined
 ): void {
   const $from = state.doc.resolve(range.from)
   if (!isValidEmojiPosition($from)) {