From 68de1ecff01a10975e4a957c141e49241191d32b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 15 Jun 2020 10:38:18 +0200
Subject: [PATCH] Unregister scroll anchors when resetting scrollers.

---
 src/Avalonia.Controls/Repeater/ViewportManager.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index 12048e10de..f43bbd5fa5 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -405,7 +405,16 @@ namespace Avalonia.Controls
 
         public void ResetScrollers()
         {
-            _scroller = null;
+            if (_scroller is object)
+            {
+                foreach (var child in _owner.Children)
+                {
+                    _scroller.UnregisterAnchorCandidate(child);
+                }
+
+                _scroller = null;
+            }
+
             _effectiveViewportChangedRevoker?.Dispose();
             _effectiveViewportChangedRevoker = null;
             _ensuredScroller = false;