diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
index 4f008705a5..85d1220543 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
@@ -69,6 +69,7 @@ class SuggestionsProcessor {
                     }
             }
             SuggestionType.Command,
+            SuggestionType.Emoji,
             is SuggestionType.Custom -> {
                 // Clear suggestions
                 emptyList()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6b0f33153f..0cad174a31 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@ coil = "3.3.0"
 showkase = "1.0.5"
 appyx = "1.7.1"
 sqldelight = "2.1.0"
-wysiwyg = "2.39.0"
+wysiwyg = "2.40.0"
 telephoto = "0.18.0"
 haze = "1.6.10"
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
index ffce571dc4..99fb298211 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
@@ -167,6 +167,7 @@ private fun Editable.checkSuggestionNeeded(): Suggestion? {
             '@' -> SuggestionType.Mention
             '#' -> SuggestionType.Room
             '/' -> SuggestionType.Command
+            ':' -> SuggestionType.Emoji
             else -> error("Unknown suggestion type. This should never happen.")
         }
         Suggestion(startOfWord, endOfWord, suggestionType, text)
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
index fc56b7f150..dcf8552099 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
@@ -28,6 +28,7 @@ sealed interface SuggestionType {
     data object Mention : SuggestionType
     data object Command : SuggestionType
     data object Room : SuggestionType
+    data object Emoji : SuggestionType
     data class Custom(val pattern: String) : SuggestionType
 
     companion object {
@@ -36,6 +37,7 @@ sealed interface SuggestionType {
                 PatternKey.At -> Mention
                 PatternKey.Slash -> Command
                 PatternKey.Hash -> Room
+                PatternKey.Colon -> Emoji
                 is PatternKey.Custom -> Custom(key.v1)
             }
         }