From e9ae26e09c3aa08003e3cf3a02a7723c48d96c50 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 9 Sep 2019 20:49:46 +0100
Subject: [PATCH] fix scrolling to selected item.

---
 src/Avalonia.Controls/Primitives/SelectingItemsControl.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 44ae89fdbc..b53b9f73b6 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -858,7 +858,7 @@ namespace Avalonia.Controls.Primitives
 
                     if (AutoScrollToSelectedItem)
                     {
-                        ScrollIntoView(_selectedIndex);
+                        ScrollIntoView(_selectedItem);
                     }
                 }
             }
@@ -1046,6 +1046,11 @@ namespace Avalonia.Controls.Primitives
                     removed?.Select(x => ElementAt(Items, x)).ToArray() ?? Array.Empty<object>());
                 RaiseEvent(e);
             }
+
+            if(AutoScrollToSelectedItem)
+            {
+                ScrollIntoView(_selectedItem);
+            }
         }
 
         private void UpdateSelectedItems(Action action)