diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
index 2342b0e1c..8cfc0f4ab 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
@@ -15,10 +15,10 @@ import java.util.List;
 
 public class DeviceAdapter extends BaseDiffAdapter<Device, DeviceAdapter.ViewHolder> {
 
-    private final OnClickListener mListener;
+    private final OnClickListener listener;
 
     public DeviceAdapter(OnClickListener listener) {
-        this.mListener = listener;
+        this.listener = listener;
     }
 
     public interface OnClickListener {
@@ -65,8 +65,8 @@ public class DeviceAdapter extends BaseDiffAdapter<Device, DeviceAdapter.ViewHol
         holder.binding.name.setText(item.getName());
         holder.binding.host.setText(item.getHost());
         holder.binding.type.setImageResource(getIcon(item));
-        holder.binding.getRoot().setOnClickListener(v -> mListener.onItemClick(item));
-        holder.binding.getRoot().setOnLongClickListener(v -> mListener.onLongClick(item));
+        holder.binding.getRoot().setOnClickListener(v -> listener.onItemClick(item));
+        holder.binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item));
     }
 
     private int getIcon(Device item) {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java
index ba4de9bec..1e0ab2671 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java
@@ -14,12 +14,12 @@ import com.fongmi.android.tv.utils.ImgUtil;
 
 public class HistoryAdapter extends BaseDiffAdapter<History, HistoryAdapter.ViewHolder> {
 
-    private final OnClickListener mListener;
+    private final OnClickListener listener;
     private int width, height;
     private boolean delete;
 
     public HistoryAdapter(OnClickListener listener) {
-        this.mListener = listener;
+        this.listener = listener;
     }
 
     public interface OnClickListener {
@@ -78,10 +78,10 @@ public class HistoryAdapter extends BaseDiffAdapter<History, HistoryAdapter.View
     }
 
     private void setClickListener(View root, History item) {
-        root.setOnLongClickListener(view -> mListener.onLongClick());
+        root.setOnLongClickListener(view -> listener.onLongClick());
         root.setOnClickListener(view -> {
-            if (isDelete()) mListener.onItemDelete(item);
-            else mListener.onItemClick(item);
+            if (isDelete()) listener.onItemDelete(item);
+            else listener.onItemClick(item);
         });
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
index f5b8bdf1e..9c4230af9 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
@@ -128,9 +128,8 @@ public class CollectFragment extends BaseFragment implements MenuProvider, Colle
 
     @Override
     public void onItemClick(int position, Collect item) {
-        mBinding.recycler.scrollToPosition(0);
+        mSearchAdapter.setItems(item.getList(), () -> mBinding.recycler.scrollToPosition(0));
         mCollectAdapter.setActivated(position);
-        mSearchAdapter.setItems(item.getList());
         mScroller.setPage(item.getPage());
     }