diff --git a/src/lib/components/common/RichTextInput/FormattingButtons.svelte b/src/lib/components/common/RichTextInput/FormattingButtons.svelte
index 48faab4578..e230462285 100644
--- a/src/lib/components/common/RichTextInput/FormattingButtons.svelte
+++ b/src/lib/components/common/RichTextInput/FormattingButtons.svelte
@@ -19,6 +19,10 @@
 	import CheckBox from '$lib/components/icons/CheckBox.svelte';
 	import ArrowLeftTag from '$lib/components/icons/ArrowLeftTag.svelte';
 	import ArrowRightTag from '$lib/components/icons/ArrowRightTag.svelte';
+
+	import EmojiPicker from '../EmojiPicker.svelte';
+	import FaceSmile from '$lib/components/icons/FaceSmile.svelte';
+	import { shortCodesToEmojis } from '$lib/stores';
 </script>
 
 <div
@@ -179,4 +183,26 @@
 			<CodeBracket />
 		</button>
 	</Tooltip>
+
+	<EmojiPicker
+		onSubmit={(shortCode) => {
+			const codepoint = $shortCodesToEmojis[shortCode];
+			if (codepoint) {
+				const emoji = codepoint
+					.split('-')
+					.map((cp) => String.fromCodePoint(parseInt(cp, 16)))
+					.join('');
+				editor?.chain().focus().insertContent(emoji).run();
+			}
+		}}
+	>
+		<Tooltip placement="top" content={$i18n.t('Emoji')}>
+			<button
+				class="hover:bg-gray-50 dark:hover:bg-gray-700 rounded-lg p-1.5 transition-all"
+				type="button"
+			>
+				<FaceSmile className="size-4" />
+			</button>
+		</Tooltip>
+	</EmojiPicker>
 </div>