diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 9eca03e08..1de8f904b 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -95,8 +95,9 @@
                     <org.thoughtcrime.securesms.components.emoji.EmojiToggle
                         android:id="@+id/emoji_toggle"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:minHeight="40dp"
                         android:paddingLeft="12dp"
                         android:paddingStart="12dp"
                         android:paddingRight="2dp"