diff --git a/app/build.gradle b/app/build.gradle
index 3bc70472a..efc1171c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         applicationId "io.github.nekoinverter.ehviewer"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 124
+        versionCode 125
         versionName "1.7.18"
         resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
                 "es", "ja", "ko", "fr", "de", "th"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 4c77e7b78..7f8445619 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -1124,7 +1124,8 @@ public class DownloadsScene extends ToolbarScene
             }
 
             EhApplication.getDownloadManager(context).moveLabel(fromPosition - 1, toPosition - 1);
-            Collections.swap(mLabels, fromPosition, toPosition);
+            final String item = mLabels.remove(fromPosition);
+            mLabels.add(toPosition, item);
         }
 
         @Override
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index d2f04f722..7faaf84a3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -1697,8 +1697,9 @@ public final class GalleryListScene extends BaseScene
             if (null == mQuickSearchList) {
                 return;
             }
-            Collections.swap(mQuickSearchList, fromPosition, toPosition);
             EhDB.moveQuickSearch(fromPosition, toPosition);
+            final QuickSearch item = mQuickSearchList.remove(fromPosition);
+            mQuickSearchList.add(toPosition, item);
         }
 
         @Override