diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index c7348f8609..9f52371d8c 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -518,15 +518,21 @@ namespace Avalonia.Controls
                     return result;
                 }
 
-                direction = direction switch
+                switch (direction)
                 {
                     //We did not find an enabled first item. Move downwards until we find one.
-                    NavigationDirection.First => NavigationDirection.Down,
+                    case NavigationDirection.First:
+                        direction = NavigationDirection.Down;
+                        wrap = false;
+                        break;
 
                     //We did not find an enabled last item. Move upwards until we find one.
-                    NavigationDirection.Last => NavigationDirection.Up,
-                    _ => direction
-                };
+                    case NavigationDirection.Last:
+                        direction = NavigationDirection.Up;
+                        wrap = false;
+                        break;
+               
+                }
 
                 from = result;
             }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index e861f4a5db..76729d8e41 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -1655,6 +1655,46 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(1, target.SelectedIndex);
         }
 
+        [Fact(Timeout = 2000)]
+        public void MoveSelection_Does_Not_Hang_When_All_Items_Are_Non_Focusable_And_We_Move_To_First_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+            target.MoveSelection(NavigationDirection.First, true);
+
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
+        [Fact(Timeout = 2000)]
+        public void MoveSelection_Does_Not_Hang_When_All_Items_Are_Non_Focusable_And_We_Move_To_Last_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+            target.MoveSelection(NavigationDirection.Last, true);
+
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
         [Fact]
         public void MoveSelection_Does_Select_Disabled_Controls()
         {