diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 7a9fe546c8..584d735204 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -123,8 +123,8 @@
         </LinearLayout>
     </RelativeLayout>
 
-    <LinearLayout android:id="@+id/emoji_drawer"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content" />
+    <FrameLayout android:id="@+id/emoji_drawer"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 844ca5a450..e4999e15e3 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -711,7 +711,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     EmojiDrawer emojiDrawerFragment = EmojiDrawer.newInstance();
     emojiDrawerFragment.setComposeEditText(composeText);
     getSupportFragmentManager().beginTransaction()
-                               .replace(R.id.emoji_drawer, emojiDrawerFragment)
+                               .add(R.id.emoji_drawer, emojiDrawerFragment)
                                .commit();
     getSupportFragmentManager().executePendingTransactions();
     emojiDrawer = Optional.of(emojiDrawerFragment);
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
index 40bd7945c5..577e19984f 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
@@ -14,6 +14,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -86,7 +87,7 @@ public class EmojiDrawer extends Fragment {
   public void show() {
     int keyboardHeight = container.getKeyboardHeight();
     Log.w("EmojiDrawer", "setting emoji drawer to height " + keyboardHeight);
-    container.setLayoutParams(new LinearLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, keyboardHeight));
+    container.setLayoutParams(new FrameLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, keyboardHeight));
     container.requestLayout();
     container.setVisibility(View.VISIBLE);
   }