diff --git a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
index 4023be50f..236f25b68 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
+++ b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
@@ -71,7 +71,7 @@ public final class EmojiPalettesView extends LinearLayout
 
     private final class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder> {
         private boolean mInitialized;
-        private Map<Integer, RecyclerView> mViews = new HashMap<>(mEmojiCategory.getShownCategories().size());
+        private final Map<Integer, RecyclerView> mViews = new HashMap<>(mEmojiCategory.getShownCategories().size());
 
         private PagerAdapter(ViewPager2 pager) {
             setHasStableIds(true);
@@ -403,7 +403,7 @@ public final class EmojiPalettesView extends LinearLayout
             if (mPager.getScrollState() != ViewPager2.SCROLL_STATE_DRAGGING) {
                 // Not swiping
                 mPager.setCurrentItem(mEmojiCategory.getTabIdFromCategoryId(
-                                mEmojiCategory.getCurrentCategoryId()), ! initial);
+                                mEmojiCategory.getCurrentCategoryId()), ! initial && ! isAnimationsDisabled());
             }
 
             if (Settings.getValues().mSecondaryStripVisible) {
@@ -418,6 +418,11 @@ public final class EmojiPalettesView extends LinearLayout
         }
     }
 
+    private boolean isAnimationsDisabled() {
+        return android.provider.Settings.Global.getFloat(getContext().getContentResolver(),
+                                                         android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f) == 0.0f;
+    }
+
     public void clearKeyboardCache() {
         if (!initialized) {
             return;