diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
index 33428b6e5..16a1ae52e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
@@ -168,7 +168,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 					if(start == 0){
 						if(emojiRegex.matcher(s.toString()).find()){
 							imm.hideSoftInputFromWindow(input.getWindowToken(), 0);
-							listener.onEmojiSelected(s.toString().substring(before));
+							listener.onEmojiSelected(s.toString());
 							input.getText().clear();
 						}
 					}
@@ -402,7 +402,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 
 	public interface Listener{
 		void onEmojiSelected(Emoji customEmoji);
-		void onEmojiSelected(String emoji);
+		void   onEmojiSelected(String emoji);
 		void onBackspace();
 	}
 }