diff --git a/res/layout/group_create_activity.xml b/res/layout/group_create_activity.xml
index b8d1a51dee..91893ac0d1 100644
--- a/res/layout/group_create_activity.xml
+++ b/res/layout/group_create_activity.xml
@@ -28,7 +28,8 @@
                 android:layout_marginRight="10dp"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
 
-            <EditText android:id="@+id/group_name"
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/group_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -55,7 +56,8 @@
                 style="@android:style/Widget.ProgressBar"
                 android:indeterminate="true" />
 
-            <TextView android:id="@+id/creating_group_text"
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/creating_group_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"