diff --git a/src/Avalonia.Controls/Selection/SelectionModel.cs b/src/Avalonia.Controls/Selection/SelectionModel.cs
index 2181b322b4..326bd10655 100644
--- a/src/Avalonia.Controls/Selection/SelectionModel.cs
+++ b/src/Avalonia.Controls/Selection/SelectionModel.cs
@@ -692,6 +692,10 @@ namespace Avalonia.Controls.Selection
                     {
                         indexesChanged = true;
                         RaisePropertyChanged(nameof(SelectedIndex));
+                    }
+
+                    if (oldSelectedIndex != _selectedIndex || operation.IsSourceUpdate)
+                    {
                         RaisePropertyChanged(nameof(SelectedItem));
                     }
 
@@ -704,6 +708,10 @@ namespace Avalonia.Controls.Selection
                     if (indexesChanged)
                     {
                         RaisePropertyChanged(nameof(SelectedIndexes));
+                    }
+
+                    if (indexesChanged || operation.IsSourceUpdate)
+                    {
                         RaisePropertyChanged(nameof(SelectedItems));
                     }
                 }