diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Device.java b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
index 1fe54bc88..220ef5cdd 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Device.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
@@ -167,7 +167,7 @@ public class Device implements Diffable<Device> {
     public boolean equals(@Nullable Object obj) {
         if (this == obj) return true;
         if (!(obj instanceof Device it)) return false;
-        return getUuid().equals(it.getUuid());
+        return getUuid().equals(it.getUuid()) && getName().equals(it.getName()) && getType() == it.getType();
     }
 
     @NonNull
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Episode.java b/app/src/main/java/com/fongmi/android/tv/bean/Episode.java
index 1574d0a40..d67ce4de7 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Episode.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Episode.java
@@ -119,7 +119,7 @@ public class Episode implements Parcelable {
     public boolean equals(@Nullable Object obj) {
         if (this == obj) return true;
         if (!(obj instanceof Episode it)) return false;
-        return getUrl().equals(it.getUrl()) && getName().equals(it.getName());
+        return getUrl().equals(it.getUrl()) && getName().equals(it.getName()) && getDesc().equals(it.getDesc());
     }
 
     @Override
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java
index cf7d9a7b1..43e95b34b 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java
@@ -90,5 +90,6 @@ public class EpisodeListDialog implements EpisodeAdapter.OnClickListener {
     @Override
     public void onItemClick(Episode item) {
         viewModel.setEpisode(item);
+        dialog.dismiss();
     }
 }