diff --git a/src/AtomUI.Controls/Collapse/Collapse.cs b/src/AtomUI.Controls/Collapse/Collapse.cs
index c2d61a5..3150c5b 100644
--- a/src/AtomUI.Controls/Collapse/Collapse.cs
+++ b/src/AtomUI.Controls/Collapse/Collapse.cs
@@ -178,6 +178,14 @@ public class Collapse : SelectingItemsControl
             SetupCollapseBorderThickness(collapseItem, index);
         }
     }
+    
+    protected override void ContainerIndexChangedOverride(Control container, int oldIndex, int newIndex)
+    {
+        if (container is CollapseItem collapseItem)
+        {
+            SetupCollapseBorderThickness(collapseItem, newIndex);
+        }
+    }
 
     private void SetupCollapseBorderThickness(CollapseItem collapseItem, int index)
     {