diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt
index b69bf02480..fa0d48dc29 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/StringUtils.kt
@@ -41,7 +41,8 @@ fun String.firstFullChar(): String {
             start = next
         } else {
             // If join, searches for the next char
-            if (codePoint == 0x200D) {
+            if (codePoint == 0xFE0F) {
+            } else if (codePoint == 0x200D) {
                 isInJoin = true
             } else {
                 // stops when two chars are not joined together
diff --git a/app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt b/app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt
index 5768e486b4..e3bd206ad4 100644
--- a/app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt
+++ b/app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt
@@ -49,4 +49,9 @@ class CharsetTest {
     fun testTeacher() {
         Assert.assertEquals("\uD83E\uDDD1\uD83C\uDFFF\u200D\uD83C\uDFEB", "\uD83E\uDDD1\uD83C\uDFFF\u200D\uD83C\uDFEBasdf".firstFullChar())
     }
+
+    @Test
+    fun testVariation() {
+        Assert.assertEquals("\uD83D\uDC68\u200D\u2764\uFE0F\u200D\uD83D\uDC8B\u200D\uD83D\uDC68", "\uD83D\uDC68\u200D\u2764\uFE0F\u200D\uD83D\uDC8B\u200D\uD83D\uDC68ddd".firstFullChar())
+    }
 }