diff --git a/app/src/leanback/res/layout/dialog_doh.xml b/app/src/leanback/res/layout/dialog_doh.xml
index 00a2f7f3e..29632553f 100644
--- a/app/src/leanback/res/layout/dialog_doh.xml
+++ b/app/src/leanback/res/layout/dialog_doh.xml
@@ -4,7 +4,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="never"
     android:padding="16dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="352dp" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/dialog_history.xml b/app/src/leanback/res/layout/dialog_history.xml
index 00a2f7f3e..29632553f 100644
--- a/app/src/leanback/res/layout/dialog_history.xml
+++ b/app/src/leanback/res/layout/dialog_history.xml
@@ -4,7 +4,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="never"
     android:padding="16dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="352dp" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/dialog_live.xml b/app/src/leanback/res/layout/dialog_live.xml
index 172fc4a82..15274e7ad 100644
--- a/app/src/leanback/res/layout/dialog_live.xml
+++ b/app/src/leanback/res/layout/dialog_live.xml
@@ -5,7 +5,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:overScrollMode="never"
     android:padding="16dp"
     app:maxHeight="264dp"
     tools:itemCount="5"
diff --git a/app/src/leanback/res/layout/dialog_site.xml b/app/src/leanback/res/layout/dialog_site.xml
index 45bda5744..cb6f34dac 100644
--- a/app/src/leanback/res/layout/dialog_site.xml
+++ b/app/src/leanback/res/layout/dialog_site.xml
@@ -12,7 +12,6 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:overScrollMode="never"
         app:maxHeight="264dp"
         tools:itemCount="5"
         tools:listitem="@layout/adapter_site" />
diff --git a/app/src/leanback/res/layout/dialog_track.xml b/app/src/leanback/res/layout/dialog_track.xml
index 8b4d1cdb5..f6f6ea848 100644
--- a/app/src/leanback/res/layout/dialog_track.xml
+++ b/app/src/leanback/res/layout/dialog_track.xml
@@ -49,7 +49,6 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:overScrollMode="never"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomRecyclerView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomRecyclerView.java
index fd75d9261..c195ccfb4 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomRecyclerView.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomRecyclerView.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -34,6 +36,7 @@ public class CustomRecyclerView extends RecyclerView {
     private void init(Context context, AttributeSet attrs) {
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CustomRecyclerView);
         maxHeight = a.getLayoutDimension(R.styleable.CustomRecyclerView_maxHeight, maxHeight);
+        setOverScrollMode(View.OVER_SCROLL_NEVER);
         a.recycle();
     }
 
diff --git a/app/src/mobile/res/layout/dialog_history.xml b/app/src/mobile/res/layout/dialog_history.xml
index e7449a979..fb114fe81 100644
--- a/app/src/mobile/res/layout/dialog_history.xml
+++ b/app/src/mobile/res/layout/dialog_history.xml
@@ -4,7 +4,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="376dp" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_live.xml b/app/src/mobile/res/layout/dialog_live.xml
index b99548d8f..14b956499 100644
--- a/app/src/mobile/res/layout/dialog_live.xml
+++ b/app/src/mobile/res/layout/dialog_live.xml
@@ -4,7 +4,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="264dp" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_site.xml b/app/src/mobile/res/layout/dialog_site.xml
index e7449a979..fb114fe81 100644
--- a/app/src/mobile/res/layout/dialog_site.xml
+++ b/app/src/mobile/res/layout/dialog_site.xml
@@ -4,7 +4,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="never"
     android:padding="24dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="376dp" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_track.xml b/app/src/mobile/res/layout/dialog_track.xml
index 396725f06..358c5ac6a 100644
--- a/app/src/mobile/res/layout/dialog_track.xml
+++ b/app/src/mobile/res/layout/dialog_track.xml
@@ -49,7 +49,6 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:overScrollMode="never"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"