diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
index 90a1b3a..d9a15c4 100644
--- a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
@@ -92,18 +92,34 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    override fun updateGroups(groups: List<OutboundGroup>) {
+    override fun updateGroups(newGroups: MutableList<OutboundGroup>) {
         val adapter = adapter ?: return
         activity?.runOnUiThread {
-            updateDisplayed(groups.isNotEmpty())
-            adapter.groups = groups
-            adapter.notifyDataSetChanged()
+            updateDisplayed(newGroups.isNotEmpty())
+            adapter.setGroups(newGroups)
         }
     }
 
     private class Adapter : RecyclerView.Adapter<GroupView>() {
 
-        lateinit var groups: List<OutboundGroup>
+        private lateinit var groups: MutableList<OutboundGroup>
+
+        @SuppressLint("NotifyDataSetChanged")
+        fun setGroups(newGroups: MutableList<OutboundGroup>) {
+            if (!::groups.isInitialized || groups.size != newGroups.size) {
+                groups = newGroups
+                notifyDataSetChanged()
+            } else {
+                newGroups.forEachIndexed { index, group ->
+                    if (this.groups[index] != group) {
+                        this.groups[index] = group
+                        notifyItemChanged(index)
+                    }
+                }
+
+            }
+        }
+
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupView {
             return GroupView(
                 ViewDashboardGroupBinding.inflate(
@@ -157,19 +173,11 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
             if (!::adapter.isInitialized) {
                 adapter = ItemAdapter(this, group, items)
                 binding.itemList.adapter = adapter
-                /* val divider =
-                     MaterialDividerItemDecoration(
-                         binding.root.context,
-                         LinearLayoutManager.VERTICAL
-                     )
-                 divider.isLastItemDecorated = false
-                 binding.itemList.addItemDecoration(divider)*/
                 (binding.itemList.itemAnimator as SimpleItemAnimator).supportsChangeAnimations =
                     false
                 binding.itemList.layoutManager = LinearLayoutManager(binding.root.context)
             } else {
-                adapter.items = items
-                adapter.notifyDataSetChanged()
+                adapter.setItems(items)
             }
             updateExpand()
         }
@@ -234,9 +242,25 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
     private class ItemAdapter(
         val groupView: GroupView,
         val group: OutboundGroup,
-        var items: List<OutboundGroupItem> = emptyList()
+        private var items: MutableList<OutboundGroupItem> = mutableListOf()
     ) :
         RecyclerView.Adapter<ItemGroupView>() {
+
+        @SuppressLint("NotifyDataSetChanged")
+        fun setItems(newItems: MutableList<OutboundGroupItem>) {
+            if (items.size != newItems.size) {
+                items = newItems
+                notifyDataSetChanged()
+            } else {
+                newItems.forEachIndexed { index, item ->
+                    if (items[index] != item) {
+                        items[index] = item
+                        notifyItemChanged(index)
+                    }
+                }
+            }
+        }
+
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemGroupView {
             return ItemGroupView(
                 ViewDashboardGroupItemBinding.inflate(
diff --git a/app/src/main/java/io/nekohasekai/sfa/utils/CommandClient.kt b/app/src/main/java/io/nekohasekai/sfa/utils/CommandClient.kt
index 1f8c2bc..06c4c51 100644
--- a/app/src/main/java/io/nekohasekai/sfa/utils/CommandClient.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/utils/CommandClient.kt
@@ -31,7 +31,7 @@ open class CommandClient(
         fun onConnected() {}
         fun onDisconnected() {}
         fun updateStatus(status: StatusMessage) {}
-        fun updateGroups(groups: List<OutboundGroup>) {}
+        fun updateGroups(newGroups: MutableList<OutboundGroup>) {}
         fun clearLog() {}
         fun appendLog(message: String) {}
         fun initializeClashMode(modeList: List<String>, currentMode: String) {}