diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
index 5700aed5aa..1820569b2c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
@@ -25,7 +25,7 @@ public class EmojiVariationSelectorPopup extends PopupWindow {
           ViewGroup.LayoutParams.WRAP_CONTENT);
     this.context  = context;
     this.listener = listener;
-    this.list     = (ViewGroup) getContentView();
+    this.list     = (ViewGroup) getContentView().findViewById(R.id.emoji_variation_container);
 
     setBackgroundDrawable(null);
     setOutsideTouchable(true);
diff --git a/app/src/main/res/layout/emoji_variation_selector.xml b/app/src/main/res/layout/emoji_variation_selector.xml
index 249ed5de65..9fcdf73b4c 100644
--- a/app/src/main/res/layout/emoji_variation_selector.xml
+++ b/app/src/main/res/layout/emoji_variation_selector.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<HorizontalScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="?attr/emoji_variation_selector_background">
+    android:layout_height="wrap_content">
 
-</LinearLayout>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/emoji_variation_container"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/emoji_variation_selector_background" />
+
+</HorizontalScrollView>
\ No newline at end of file