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 1820569b2c..69e78337ef 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
@@ -10,6 +10,7 @@ import android.widget.PopupWindow;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;
 
@@ -27,7 +28,7 @@ public class EmojiVariationSelectorPopup extends PopupWindow {
     this.listener = listener;
     this.list     = (ViewGroup) getContentView().findViewById(R.id.emoji_variation_container);
 
-    setBackgroundDrawable(null);
+    setBackgroundDrawable(ThemeUtil.getThemedDrawable(context, R.attr.emoji_variation_selector_background));
     setOutsideTouchable(true);
 
     if (Build.VERSION.SDK_INT >= 21) {
diff --git a/app/src/main/res/layout/emoji_variation_selector.xml b/app/src/main/res/layout/emoji_variation_selector.xml
index 9fcdf73b4c..7dc89d54af 100644
--- a/app/src/main/res/layout/emoji_variation_selector.xml
+++ b/app/src/main/res/layout/emoji_variation_selector.xml
@@ -8,7 +8,6 @@
         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" />
+        android:layout_height="wrap_content" />
 
 </HorizontalScrollView>
\ No newline at end of file