From 16d75632fe362ddd79d5ed0e9dfe33357e0c6952 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Fri, 15 Jul 2022 16:29:49 +0200
Subject: [PATCH] Properly terminate when reaching "from" element again

---
 src/Avalonia.Controls/ItemsControl.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 9f52371d8c..6aa4006ddb 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -502,11 +502,13 @@ namespace Avalonia.Controls
             IInputElement? from,
             bool wrap)
         {
-            for(;;)
+            var current = from;
+
+            for (;;)
             {
-                var result = container.GetControl(direction, from, wrap);
+                var result = container.GetControl(direction, current, wrap);
 
-                if (result is null || result == from)
+                if (result is null || current == from)
                 {
                     return null;
                 }
@@ -534,7 +536,7 @@ namespace Avalonia.Controls
                
                 }
 
-                from = result;
+                current = result;
             }
         }