diff --git a/src/main/java/org/thoughtcrime/securesms/components/emoji/StickerPickerView.java b/src/main/java/org/thoughtcrime/securesms/components/emoji/StickerPickerView.java
index 42592a7b7..7e64da642 100644
--- a/src/main/java/org/thoughtcrime/securesms/components/emoji/StickerPickerView.java
+++ b/src/main/java/org/thoughtcrime/securesms/components/emoji/StickerPickerView.java
@@ -21,6 +21,8 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -75,6 +77,14 @@ public class StickerPickerView extends RecyclerView {
       }
     }
 
+    // Sort stickers just to provide consistent order
+    Collections.sort(stickerFiles, new Comparator<File>() {
+      @Override
+      public int compare(File f1, File f2) {
+        return f1.getName().compareToIgnoreCase(f2.getName());
+      }
+    });
+
     return stickerFiles;
   }