diff --git a/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java b/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java
index c8f905338..c33dc2a7a 100644
--- a/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java
+++ b/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java
@@ -35,8 +35,7 @@ import com.hippo.ehviewer.Settings;
 import com.hippo.yorozuya.NumberUtils;
 
 /**
- * Add setOnItemClickListener, setOnItemLongClickListener and setChoiceMode for
- * RecyclerView
+ * Add setChoiceMode for RecyclerView
  */
 // Get some code from twoway-view and AbsListView.
 public class EasyRecyclerView extends ScrollLessRecyclerView {
diff --git a/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java b/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java
index cc8ef7436..edf0fe605 100644
--- a/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java
+++ b/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java
@@ -56,7 +56,7 @@ public class FastScroller extends View {
 
     private RecyclerView mRecyclerView;
     private RecyclerView.OnScrollListener mOnScrollChangeListener;
-    private RecyclerView.Adapter mAdapter;
+    private RecyclerView.Adapter<?> mAdapter;
     private RecyclerView.AdapterDataObserver mAdapterDataObserver;
 
     private Drawable mHandler;
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 8e5d821fc..67ca6b179 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -71,8 +71,8 @@ public class ContentLayout extends FrameLayout {
 
     private ContentHelper<?> mContentHelper;
 
-    private int mRecyclerViewOriginTop;
     private int mRecyclerViewOriginBottom;
+    private int mFastScrollerOriginBottom;
 
     public ContentLayout(Context context) {
         super(context);
@@ -128,6 +128,7 @@ public class ContentLayout extends FrameLayout {
         RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true);
 
         mRecyclerViewOriginBottom = mRecyclerView.getPaddingBottom();
+        mFastScrollerOriginBottom = mFastScroller.getPaddingBottom();
     }
 
     @NonNull
@@ -172,11 +173,15 @@ public class ContentLayout extends FrameLayout {
     public void setFitPaddingBottom(int fitPaddingBottom) {
         // RecyclerView
         mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(),
-                mRecyclerView.getPaddingTop(), mRecyclerView.getPaddingRight(),
+                mRecyclerView.getPaddingTop(),
+                mRecyclerView.getPaddingRight(),
                 mRecyclerViewOriginBottom + fitPaddingBottom);
         mTipView.setPadding(mTipView.getPaddingLeft(), mTipView.getPaddingTop(), mTipView.getPaddingRight(), fitPaddingBottom);
         mProgressView.setPadding(mProgressView.getPaddingLeft(), mProgressView.getPaddingTop(), mProgressView.getPaddingRight(), fitPaddingBottom);
-        mFastScroller.setPadding(mFastScroller.getPaddingLeft(), mFastScroller.getPaddingTop(), mFastScroller.getPaddingRight(), fitPaddingBottom);
+        mFastScroller.setPadding(mFastScroller.getPaddingLeft(),
+                mFastScroller.getPaddingTop(),
+                mFastScroller.getPaddingRight(),
+                mFastScrollerOriginBottom + fitPaddingBottom);
         if (fitPaddingBottom > LayoutUtils.dp2pix(getContext(), 16)) {
             mBottomProgress.setPadding(0, 0, 0, fitPaddingBottom);
         } else {
diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
index 68d0a88cd..a2b7159ae 100644
--- a/app/src/main/res/layout/scene_download.xml
+++ b/app/src/main/res/layout/scene_download.xml
@@ -38,7 +38,8 @@
             android:paddingLeft="20dp"
             android:paddingTop="8dp"
             android:paddingRight="4dp"
-            android:paddingBottom="8dp" />
+            android:paddingBottom="8dp"
+            app:fitSystemWindowsInsets="bottom" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/scene_history.xml b/app/src/main/res/layout/scene_history.xml
index a005b21f4..9a245aae0 100644
--- a/app/src/main/res/layout/scene_history.xml
+++ b/app/src/main/res/layout/scene_history.xml
@@ -38,7 +38,8 @@
             android:paddingLeft="20dp"
             android:paddingTop="8dp"
             android:paddingRight="4dp"
-            android:paddingBottom="8dp" />
+            android:paddingBottom="8dp"
+            app:fitSystemWindowsInsets="bottom" />
 
     </FrameLayout>