From cd7837ec6d72e8fe645ab9e906ba44162c839c7b Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 12:27:10 +0530
Subject: [PATCH 01/14] Fix for 26810

---
 .../Handlers/Items/Android/MauiRecyclerView.cs     | 11 ++---------
 .../src/Core/Handlers/Items/iOS/ItemsViewLayout.cs | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index ab43bb156c0a..4bae74e49e5c 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -374,15 +374,8 @@ protected virtual void UpdateItemsUpdatingScrollMode()
 			if (ItemsViewAdapter == null || ItemsView == null)
 				return;
 
-			if (ItemsView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
-			{
-				// Keeping the current items in view is the default, so we don't need to watch for data changes
-				_itemsUpdateScrollObserver.Stop(ItemsViewAdapter);
-			}
-			else
-			{
-				_itemsUpdateScrollObserver.Start(ItemsViewAdapter);
-			}
+			// We need to observe the adapter for changes for the ItemsUpdatingScrollMode.
+			_itemsUpdateScrollObserver.Start(ItemsViewAdapter);
 		}
 
 		public virtual void ScrollTo(ScrollToRequestEventArgs args)
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
index c6f8473b629d..c57be4802432 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
@@ -500,6 +500,10 @@ public override void FinalizeCollectionViewUpdates()
 			{
 				ForceScrollToLastItem(CollectionView, _itemsLayout);
 			}
+			else if (ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
+			{
+				ForceScrollToFirstItem(CollectionView, _itemsLayout);
+			}
 		}
 
 		void TrackOffsetAdjustment()
@@ -565,6 +569,16 @@ static bool UpdateWillShiftVisibleItems(UICollectionView collectionView, UIColle
 			return false;
 		}
 
+		//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
+		void ForceScrollToFirstItem(UICollectionView collectionView, ItemsLayout itemsLayout)
+		{
+			if (collectionView.NumberOfItemsInSection(0) > 0)
+			{
+				var indexPath = NSIndexPath.FromItemSection(0, 0);
+				collectionView.ScrollToItem(indexPath, UICollectionViewScrollPosition.Top, true);
+			}
+		}
+
 		static void ForceScrollToLastItem(UICollectionView collectionView, ItemsLayout itemsLayout)
 		{
 			var sections = (int)collectionView.NumberOfSections();

From ffd2647d558d513ddda4f415e8b799470e764d32 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 19:20:01 +0530
Subject: [PATCH 02/14] Update ItemsViewLayout.cs

---
 .../src/Core/Handlers/Items/iOS/ItemsViewLayout.cs         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
index c57be4802432..fd924541a02d 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
@@ -572,6 +572,13 @@ static bool UpdateWillShiftVisibleItems(UICollectionView collectionView, UIColle
 		//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
 		void ForceScrollToFirstItem(UICollectionView collectionView, ItemsLayout itemsLayout)
 		{
+			var sections = (int)collectionView.NumberOfSections();
+
+			if (sections == 0)
+			{
+				return;
+			}
+
 			if (collectionView.NumberOfItemsInSection(0) > 0)
 			{
 				var indexPath = NSIndexPath.FromItemSection(0, 0);

From df7a2e3f27c0804e49ca52f30a74ecd48c3d8e43 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 19:43:00 +0530
Subject: [PATCH 03/14] TestCases for 26810

---
 .../TestCases.HostApp/Issues/Issue26810.xaml  | 30 ++++++++++++
 .../Issues/Issue26810.xaml.cs                 | 47 +++++++++++++++++++
 .../Tests/Issues/Issue26810.cs                | 29 ++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
new file mode 100644
index 000000000000..753456a78d9a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue26810">
+    <Grid RowDefinitions="100,100,Auto"
+          AutomationId="26810MainGrid">
+        <Button Text="Scroll to Random Item"
+                AutomationId="26810Button"
+                x:Name="ScrollToButton"
+                Grid.Row="0"
+                Clicked="ScrollToButton_Clicked"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
+        <CollectionView x:Name="CollectionView"
+                        AutomationId="26810CollectionView"
+                        Grid.Row="2"
+                        Loaded="CollectionView_Loaded">
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid HeightRequest="50">
+                        <Label Text="{Binding Name}"
+                               AutomationId="{Binding AutomationId}"
+                               VerticalOptions="Center"
+                               HorizontalOptions="Center"/>
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
new file mode 100644
index 000000000000..dbe800ea3e40
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
@@ -0,0 +1,47 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample.Issues;
+[Issue(IssueTracker.Github, 26810, "Scroll To first item in CollectionView when updating the collection with KeepItemsInView",
+		PlatformAffected.Android)]
+public partial class Issue26810 : ContentPage
+{
+	private ObservableCollection<Item> Items { get; set; } = new ObservableCollection<Item>();
+	private Random _random = new Random();
+
+	public Issue26810()
+	{
+		InitializeComponent();
+		for (int i = 1; i <= 10; i++)
+		{
+			Items.Add(new Item { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
+		}
+		CollectionView.ItemsSource = Items;
+		this.BindingContext = this;
+	}
+
+	private async void CollectionView_Loaded(object sender, EventArgs e)
+	{
+		// Adding items with a small delay in LoadedEvent
+		for (int i = 10; i <= 30; i++)
+		{
+			Items.Add(new Item { Name = $" Item {i}", AutomationId = $"Item{i}" });
+			await Task.Delay(500); // Simulate delay
+		}
+	}
+
+	private void ScrollToButton_Clicked(object sender, EventArgs e)
+	{
+		if (Items.Count > 0)
+		{
+			int randomIndex = _random.Next(Items.Count);
+			CollectionView.ScrollTo(randomIndex);
+		}
+	}
+}
+
+public class Item
+{
+	public string Name { get; set; }
+	public string AutomationId { get; set; }
+}
+
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
new file mode 100644
index 000000000000..d05699a7e611
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	internal class Issue26810 : _IssuesUITest
+	{
+		public override string Issue => "Scroll To first item in CollectionView when updating the collection with KeepItemsInView";
+
+		public Issue26810(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.ActivityIndicator)]
+		public void ScrollToFirstItemOnCollectionChanged()
+		{
+			// Is a Android and iOS issue; see https://github.com/dotnet/maui/issues/26810
+			App.WaitForElement("26810MainGrid");
+			App.WaitForElement("Item1");
+			App.WaitForElement("26810Button");
+			App.Click("26810Button");
+			App.WaitForElement("Item1");
+
+		}
+	}
+}

From 03c9f3bae7dfed0be528c4a535e986785f238ec6 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:11:32 +0530
Subject: [PATCH 04/14] Update Issue26810.xaml

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
index 753456a78d9a..ea323aac4049 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue26810">
-    <Grid RowDefinitions="100,100,Auto"
+    <Grid RowDefinitions="100,Auto"
           AutomationId="26810MainGrid">
         <Button Text="Scroll to Random Item"
                 AutomationId="26810Button"
@@ -13,7 +13,7 @@
                 VerticalOptions="Center"/>
         <CollectionView x:Name="CollectionView"
                         AutomationId="26810CollectionView"
-                        Grid.Row="2"
+                        Grid.Row="1"
                         Loaded="CollectionView_Loaded">
             <CollectionView.ItemTemplate>
                 <DataTemplate>

From 085d9242a2052e113b0bcd26086cdc84ac662ac4 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:59:09 +0530
Subject: [PATCH 05/14] Update Issue26810.xaml.cs

---
 .../tests/TestCases.HostApp/Issues/Issue26810.xaml.cs    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
index dbe800ea3e40..744957275e29 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
@@ -5,7 +5,7 @@ namespace Maui.Controls.Sample.Issues;
 		PlatformAffected.Android)]
 public partial class Issue26810 : ContentPage
 {
-	private ObservableCollection<Item> Items { get; set; } = new ObservableCollection<Item>();
+	private ObservableCollection<Issue26810ItemModel> Items { get; set; } = new ObservableCollection<Issue26810ItemModel>();
 	private Random _random = new Random();
 
 	public Issue26810()
@@ -13,7 +13,7 @@ public Issue26810()
 		InitializeComponent();
 		for (int i = 1; i <= 10; i++)
 		{
-			Items.Add(new Item { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
+			Items.Add(new Issue26810ItemModel { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
 		}
 		CollectionView.ItemsSource = Items;
 		this.BindingContext = this;
@@ -24,7 +24,7 @@ private async void CollectionView_Loaded(object sender, EventArgs e)
 		// Adding items with a small delay in LoadedEvent
 		for (int i = 10; i <= 30; i++)
 		{
-			Items.Add(new Item { Name = $" Item {i}", AutomationId = $"Item{i}" });
+			Items.Add(new Issue26810ItemModel { Name = $" Item {i}", AutomationId = $"Item{i}" });
 			await Task.Delay(500); // Simulate delay
 		}
 	}
@@ -39,9 +39,8 @@ private void ScrollToButton_Clicked(object sender, EventArgs e)
 	}
 }
 
-public class Item
+public class Issue26810ItemModel
 {
 	public string Name { get; set; }
 	public string AutomationId { get; set; }
 }
-

From 1e9fcb9aab5c4b71a3b9992a4cef4160491a38ec Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:51:48 +0530
Subject: [PATCH 06/14] Update Issue26810.cs

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
index d05699a7e611..6edd8a95be63 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
@@ -14,7 +14,7 @@ public Issue26810(TestDevice device) : base(device)
 		}
 
 		[Test]
-		[Category(UITestCategories.ActivityIndicator)]
+		[Category(UITestCategories.CollectionView)]
 		public void ScrollToFirstItemOnCollectionChanged()
 		{
 			// Is a Android and iOS issue; see https://github.com/dotnet/maui/issues/26810

From de4acfe9de173bbf19995dacd3219dd1ae9afe01 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 22:36:40 +0530
Subject: [PATCH 07/14] Update Issue26810.xaml

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
index ea323aac4049..a2d3bc260339 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue26810">
-    <Grid RowDefinitions="100,Auto"
+    <Grid RowDefinitions="100,*"
           AutomationId="26810MainGrid">
         <Button Text="Scroll to Random Item"
                 AutomationId="26810Button"

From e14ce95af450917048d29e1dc913786abd7ac699 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Wed, 15 Jan 2025 22:37:45 +0530
Subject: [PATCH 08/14] Update MauiRecyclerView.cs

---
 .../src/Core/Handlers/Items/Android/MauiRecyclerView.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index 4bae74e49e5c..f82b6e009691 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -591,6 +591,10 @@ internal void AdjustScrollForItemUpdate()
 			{
 				ScrollHelper.UndoNextScrollAdjustment();
 			}
+			else if (ItemsView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
+			{
+				ScrollTo(new ScrollToRequestEventArgs(0, 0, Microsoft.Maui.Controls.ScrollToPosition.Start, true));
+			}
 		}
 
 		GridLayoutManager CreateGridLayout(GridItemsLayout gridItemsLayout)

From 18a78785f15883403a00acb37b1d1fb26d4ab522 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:44:31 +0530
Subject: [PATCH 09/14] Update ItemsViewLayout.cs

---
 .../src/Core/Handlers/Items/iOS/ItemsViewLayout.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
index fd924541a02d..e0ddb02411b0 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
@@ -502,7 +502,7 @@ public override void FinalizeCollectionViewUpdates()
 			}
 			else if (ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
 			{
-				ForceScrollToFirstItem(CollectionView, _itemsLayout);
+				ForceScrollToFirstItem(CollectionView);
 			}
 		}
 
@@ -569,10 +569,10 @@ static bool UpdateWillShiftVisibleItems(UICollectionView collectionView, UIColle
 			return false;
 		}
 
-		//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
-		void ForceScrollToFirstItem(UICollectionView collectionView, ItemsLayout itemsLayout)
+		static void ForceScrollToFirstItem(UICollectionView collectionView)
 		{
-			var sections = (int)collectionView.NumberOfSections();
+			//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
+			int sections = (int)collectionView.NumberOfSections();
 
 			if (sections == 0)
 			{

From b5c54ff43e60bb908cb93011196d01618b7fc77b Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:50:27 +0530
Subject: [PATCH 10/14] Testcases changes

---
 .../TestCases.HostApp/Issues/Issue26810.xaml   | 12 +++++++++---
 .../Issues/Issue26810.xaml.cs                  | 18 +++++-------------
 .../Tests/Issues/Issue26810.cs                 |  4 ++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
index a2d3bc260339..ec29cff457ea 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue26810">
-    <Grid RowDefinitions="100,*"
+    <Grid RowDefinitions="100,100,*"
           AutomationId="26810MainGrid">
         <Button Text="Scroll to Random Item"
                 AutomationId="26810Button"
@@ -11,10 +11,16 @@
                 Clicked="ScrollToButton_Clicked"
                 HorizontalOptions="Center"
                 VerticalOptions="Center"/>
+        <Button Text="Add New Item"
+                AutomationId="26810AddButton"
+                x:Name="AddButton"
+                Grid.Row="1"
+                Clicked="AddButton_Clicked"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
         <CollectionView x:Name="CollectionView"
                         AutomationId="26810CollectionView"
-                        Grid.Row="1"
-                        Loaded="CollectionView_Loaded">
+                        Grid.Row="2">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid HeightRequest="50">
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
index 744957275e29..691311557d56 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
@@ -6,12 +6,10 @@ namespace Maui.Controls.Sample.Issues;
 public partial class Issue26810 : ContentPage
 {
 	private ObservableCollection<Issue26810ItemModel> Items { get; set; } = new ObservableCollection<Issue26810ItemModel>();
-	private Random _random = new Random();
-
 	public Issue26810()
 	{
 		InitializeComponent();
-		for (int i = 1; i <= 10; i++)
+		for (int i = 1; i <= 20; i++)
 		{
 			Items.Add(new Issue26810ItemModel { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
 		}
@@ -19,22 +17,16 @@ public Issue26810()
 		this.BindingContext = this;
 	}
 
-	private async void CollectionView_Loaded(object sender, EventArgs e)
+	private void AddButton_Clicked(object sender, EventArgs e)
 	{
-		// Adding items with a small delay in LoadedEvent
-		for (int i = 10; i <= 30; i++)
-		{
-			Items.Add(new Issue26810ItemModel { Name = $" Item {i}", AutomationId = $"Item{i}" });
-			await Task.Delay(500); // Simulate delay
-		}
+		Items.Add(new Issue26810ItemModel { Name = $"Item {Items.Count + 1}", AutomationId = $"Item{Items.Count + 1}" });
 	}
-
 	private void ScrollToButton_Clicked(object sender, EventArgs e)
 	{
 		if (Items.Count > 0)
 		{
-			int randomIndex = _random.Next(Items.Count);
-			CollectionView.ScrollTo(randomIndex);
+			// Scroll to random item
+			CollectionView.ScrollTo(18, position: ScrollToPosition.End, animate: true);
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
index 6edd8a95be63..edf01343074a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
@@ -18,10 +18,10 @@ public Issue26810(TestDevice device) : base(device)
 		public void ScrollToFirstItemOnCollectionChanged()
 		{
 			// Is a Android and iOS issue; see https://github.com/dotnet/maui/issues/26810
-			App.WaitForElement("26810MainGrid");
 			App.WaitForElement("Item1");
-			App.WaitForElement("26810Button");
 			App.Click("26810Button");
+			App.WaitForElement("Item19");
+			App.Click("26810AddButton");
 			App.WaitForElement("Item1");
 
 		}

From 3fe0b97931963c368801719f6ceb03bf262fa475 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:33:54 +0530
Subject: [PATCH 11/14] Commit for HorizontalChanges

---
 .../Handlers/Items/iOS/ItemsViewLayout.cs     |  9 +-
 .../TestCases.HostApp/Issues/Issue26810.xaml  | 91 ++++++++++++-------
 .../Issues/Issue26810.xaml.cs                 | 17 +++-
 .../Issues/Issue26810Vertical.xaml            | 61 +++++++++++++
 .../Issues/Issue26810Vertical.xaml.cs         | 47 ++++++++++
 .../Tests/Issues/Issue26810.cs                | 27 +++++-
 .../Tests/Issues/Issue26810Vertical.cs        | 54 +++++++++++
 7 files changed, 269 insertions(+), 37 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810Vertical.cs

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
index e0ddb02411b0..65cbd219d15c 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
@@ -502,7 +502,7 @@ public override void FinalizeCollectionViewUpdates()
 			}
 			else if (ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
 			{
-				ForceScrollToFirstItem(CollectionView);
+				ForceScrollToFirstItem(CollectionView, _itemsLayout);
 			}
 		}
 
@@ -569,7 +569,7 @@ static bool UpdateWillShiftVisibleItems(UICollectionView collectionView, UIColle
 			return false;
 		}
 
-		static void ForceScrollToFirstItem(UICollectionView collectionView)
+		static void ForceScrollToFirstItem(UICollectionView collectionView, ItemsLayout itemsLayout)
 		{
 			//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
 			int sections = (int)collectionView.NumberOfSections();
@@ -582,7 +582,10 @@ static void ForceScrollToFirstItem(UICollectionView collectionView)
 			if (collectionView.NumberOfItemsInSection(0) > 0)
 			{
 				var indexPath = NSIndexPath.FromItemSection(0, 0);
-				collectionView.ScrollToItem(indexPath, UICollectionViewScrollPosition.Top, true);
+				if (itemsLayout.Orientation == ItemsLayoutOrientation.Vertical)
+					collectionView.ScrollToItem(indexPath, UICollectionViewScrollPosition.Top, true);
+				else
+					collectionView.ScrollToItem(indexPath, UICollectionViewScrollPosition.Right, true);
 			}
 		}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
index ec29cff457ea..4534f3e97ad9 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml
@@ -1,36 +1,65 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:cv1="clr-namespace:Maui.Controls.Sample"
              x:Class="Maui.Controls.Sample.Issues.Issue26810">
-    <Grid RowDefinitions="100,100,*"
-          AutomationId="26810MainGrid">
-        <Button Text="Scroll to Random Item"
-                AutomationId="26810Button"
-                x:Name="ScrollToButton"
-                Grid.Row="0"
-                Clicked="ScrollToButton_Clicked"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"/>
-        <Button Text="Add New Item"
-                AutomationId="26810AddButton"
-                x:Name="AddButton"
-                Grid.Row="1"
-                Clicked="AddButton_Clicked"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"/>
-        <CollectionView x:Name="CollectionView"
-                        AutomationId="26810CollectionView"
-                        Grid.Row="2">
-            <CollectionView.ItemTemplate>
-                <DataTemplate>
-                    <Grid HeightRequest="50">
-                        <Label Text="{Binding Name}"
-                               AutomationId="{Binding AutomationId}"
-                               VerticalOptions="Center"
-                               HorizontalOptions="Center"/>
-                    </Grid>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </CollectionView>
-    </Grid>
+        <Grid RowDefinitions="50,50,50,*"
+              AutomationId="26810MainGrid">
+                <Grid Grid.Row="0"
+                      ColumnDefinitions="*,*,*">
+                        <Button Text="KeepItemsInView"
+                                AutomationId="26810FirstItemButton"
+                                x:Name="KeepItemsInView"
+                                Grid.Column="0"
+                                Clicked="ItemsUpdatingScrollMode_Clicked"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center"/>
+                        <Button Text="KeepScrollOffset"
+                                AutomationId="26810ScrollOffsetButton"
+                                x:Name="KeepScrollOffset"
+                                Grid.Column="1"
+                                Clicked="ItemsUpdatingScrollMode_Clicked"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center"/>
+                        <Button Text="KeepLastItemInView"
+                                AutomationId="26810LastItemButton"
+                                x:Name="KeepLastItemInView"
+                                Grid.Column="2"
+                                Clicked="ItemsUpdatingScrollMode_Clicked"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center"/>
+                </Grid>
+                <Button Text="Scroll to Random Item"
+                        AutomationId="26810Button"
+                        x:Name="ScrollToButton"
+                        Grid.Row="1"
+                        Clicked="ScrollToButton_Clicked"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center"/>
+                <Button Text="Add New Item"
+                        AutomationId="26810AddButton"
+                        x:Name="AddButton"
+                        Grid.Row="2"
+                        Clicked="AddButton_Clicked"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center"/>
+                <cv1:CollectionView1 x:Name="CollectionView"
+                                     AutomationId="26810CollectionView"
+                                     Grid.Row="3">
+                        <cv1:CollectionView1.ItemsLayout>
+                                <LinearItemsLayout ItemSpacing="5"
+                                                   Orientation="Horizontal"/>
+                        </cv1:CollectionView1.ItemsLayout>
+                        <cv1:CollectionView1.ItemTemplate>
+                                <DataTemplate>
+                                        <Grid HeightRequest="50">
+                                                <Label Text="{Binding Name}"
+                                                       AutomationId="{Binding AutomationId}"
+                                                       VerticalOptions="Center"
+                                                       HorizontalOptions="Center"/>
+                                        </Grid>
+                                </DataTemplate>
+                        </cv1:CollectionView1.ItemTemplate>
+                </cv1:CollectionView1>
+        </Grid>
 </ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
index 691311557d56..ce46abb1e753 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810.xaml.cs
@@ -9,7 +9,7 @@ public partial class Issue26810 : ContentPage
 	public Issue26810()
 	{
 		InitializeComponent();
-		for (int i = 1; i <= 20; i++)
+		for (int i = 1; i <= 30; i++)
 		{
 			Items.Add(new Issue26810ItemModel { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
 		}
@@ -17,6 +17,19 @@ public Issue26810()
 		this.BindingContext = this;
 	}
 
+	private void ItemsUpdatingScrollMode_Clicked(object sender, EventArgs e)
+	{
+		var button = (Button)sender;
+		if (button.Text == "KeepScrollOffset")
+		{
+			CollectionView.ItemsUpdatingScrollMode = ItemsUpdatingScrollMode.KeepScrollOffset;
+		}
+		else if (button.Text == "KeepLastItemInView")
+		{
+			CollectionView.ItemsUpdatingScrollMode = ItemsUpdatingScrollMode.KeepLastItemInView;
+		}
+	}
+
 	private void AddButton_Clicked(object sender, EventArgs e)
 	{
 		Items.Add(new Issue26810ItemModel { Name = $"Item {Items.Count + 1}", AutomationId = $"Item{Items.Count + 1}" });
@@ -26,7 +39,7 @@ private void ScrollToButton_Clicked(object sender, EventArgs e)
 		if (Items.Count > 0)
 		{
 			// Scroll to random item
-			CollectionView.ScrollTo(18, position: ScrollToPosition.End, animate: true);
+			CollectionView.ScrollTo(19, position: ScrollToPosition.End, animate: true);
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml
new file mode 100644
index 000000000000..29a7632f3af0
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:cv1="clr-namespace:Maui.Controls.Sample"
+             x:Class="Maui.Controls.Sample.Issues.Issue26810Vertical">
+    <Grid RowDefinitions="50,50,50,*"
+          AutomationId="26810MainGrid">
+        <Grid Grid.Row="0"
+              ColumnDefinitions="*,*,*">
+            <Button Text="KeepItemsInView"
+                    AutomationId="26810FirstItemButton"
+                    x:Name="KeepItemsInView"
+                    Grid.Column="0"
+                    Clicked="ItemsUpdatingScrollMode_Clicked"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center"/>
+            <Button Text="KeepScrollOffset"
+                    AutomationId="26810ScrollOffsetButton"
+                    x:Name="KeepScrollOffset"
+                    Grid.Column="1"
+                    Clicked="ItemsUpdatingScrollMode_Clicked"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center"/>
+            <Button Text="KeepLastItemInView"
+                    AutomationId="26810LastItemButton"
+                    x:Name="KeepLastItemInView"
+                    Grid.Column="2"
+                    Clicked="ItemsUpdatingScrollMode_Clicked"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center"/>
+        </Grid>
+        <Button Text="Scroll to Random Item"
+                AutomationId="26810Button"
+                x:Name="ScrollToButton"
+                Grid.Row="1"
+                Clicked="ScrollToButton_Clicked"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
+        <Button Text="Add New Item"
+                AutomationId="26810AddButton"
+                x:Name="AddButton"
+                Grid.Row="2"
+                Clicked="AddButton_Clicked"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
+        <cv1:CollectionView1 x:Name="CollectionView"
+                             AutomationId="26810CollectionView"
+                             Grid.Row="3">
+            <cv1:CollectionView1.ItemTemplate>
+                <DataTemplate>
+                    <Grid HeightRequest="50">
+                        <Label Text="{Binding Name}"
+                               AutomationId="{Binding AutomationId}"
+                               VerticalOptions="Center"
+                               HorizontalOptions="Center"/>
+                    </Grid>
+                </DataTemplate>
+            </cv1:CollectionView1.ItemTemplate>
+        </cv1:CollectionView1>
+    </Grid>
+</ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml.cs
new file mode 100644
index 000000000000..7b386db71961
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26810Vertical.xaml.cs
@@ -0,0 +1,47 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.None, 26810, "Scroll To first item in CollectionView with vertical orientation when updating the collection with KeepItemsInView",
+		PlatformAffected.Android)]
+
+public partial class Issue26810Vertical : ContentPage
+{
+
+	private ObservableCollection<Issue26810ItemModel> Items { get; set; } = new ObservableCollection<Issue26810ItemModel>();
+	public Issue26810Vertical()
+	{
+		InitializeComponent();
+		for (int i = 1; i <= 30; i++)
+		{
+			Items.Add(new Issue26810ItemModel { Name = $"Preloaded Item {i}", AutomationId = $"Item{i}" });
+		}
+		CollectionView.ItemsSource = Items;
+		this.BindingContext = this;
+	}
+	private void ItemsUpdatingScrollMode_Clicked(object sender, EventArgs e)
+	{
+		var button = (Button)sender;
+		if (button.Text == "KeepScrollOffset")
+		{
+			CollectionView.ItemsUpdatingScrollMode = ItemsUpdatingScrollMode.KeepScrollOffset;
+		}
+		else if (button.Text == "KeepLastItemInView")
+		{
+			CollectionView.ItemsUpdatingScrollMode = ItemsUpdatingScrollMode.KeepLastItemInView;
+		}
+	}
+
+	private void AddButton_Clicked(object sender, EventArgs e)
+	{
+		Items.Add(new Issue26810ItemModel { Name = $"Item {Items.Count + 1}", AutomationId = $"Item{Items.Count + 1}" });
+	}
+	private void ScrollToButton_Clicked(object sender, EventArgs e)
+	{
+		if (Items.Count > 0)
+		{
+			// Scroll to random item
+			CollectionView.ScrollTo(19, position: ScrollToPosition.End, animate: true);
+		}
+	}
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
index edf01343074a..3012ad80cc6d 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810.cs
@@ -18,12 +18,37 @@ public Issue26810(TestDevice device) : base(device)
 		public void ScrollToFirstItemOnCollectionChanged()
 		{
 			// Is a Android and iOS issue; see https://github.com/dotnet/maui/issues/26810
+			//KeepItemsInView
 			App.WaitForElement("Item1");
 			App.Click("26810Button");
-			App.WaitForElement("Item19");
+			//Scrolled to 20 th item
+			App.WaitForElement("Item20");
+			//Added a new item
 			App.Click("26810AddButton");
+			//Checking while item is scrolled to first position or not
 			App.WaitForElement("Item1");
 
+			//KeepScrollOffset
+			App.WaitForElement("Item1");
+			// Changing ItemsUpdatingScrollMode to KeepScrollOffset
+			App.Click("26810ScrollOffsetButton");
+			App.Click("26810Button");
+			//Scrolled to 20 th item
+			App.WaitForElement("Item20");
+			//Added a new item
+			App.Click("26810AddButton");
+			//Checking scroll position is maintained or not
+			App.WaitForElement("Item20");
+
+			//KeepScrollOffset
+			// Changing ItemsUpdatingScrollMode to KeepLastItemInView
+			App.WaitForElement("26810LastItemButton");
+			App.Click("26810LastItemButton");
+			//Added a new item
+			App.Click("26810AddButton");
+			//Checking Lastitem is visible or not 
+			App.WaitForElement("Item33");
+
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810Vertical.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810Vertical.cs
new file mode 100644
index 000000000000..6d4e8fc917c1
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue26810Vertical.cs
@@ -0,0 +1,54 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue26810Vertical : _IssuesUITest
+{
+	public override string Issue => "Scroll To first item in CollectionView with vertical orientation when updating the collection with KeepItemsInView";
+
+	public Issue26810Vertical(TestDevice device) : base(device)
+	{
+	}
+
+	[Test]
+	[Category(UITestCategories.CollectionView)]
+	public void ScrollToFirstItemOnCollectionChanged()
+	{
+		// Is a Android and iOS issue; see https://github.com/dotnet/maui/issues/26810
+		//KeepItemsInView
+		App.WaitForElement("Item1");
+		App.Click("26810Button");
+		//Scrolled to 20 th item
+		App.WaitForElement("Item20");
+		//Added a new item
+		App.Click("26810AddButton");
+		//Checking while item is scrolled to first position or not
+		App.WaitForElement("Item1");
+
+		//KeepScrollOffset
+		App.WaitForElement("Item1");
+		// Changing ItemsUpdatingScrollMode to KeepScrollOffset
+		App.Click("26810ScrollOffsetButton");
+		App.Click("26810Button");
+		//Scrolled to 20 th item
+		App.WaitForElement("Item20");
+		//Added a new item
+		App.Click("26810AddButton");
+		//Checking scroll position is maintained or not
+		App.WaitForElement("Item20");
+
+		//KeepScrollOffset
+		// Changing ItemsUpdatingScrollMode to KeepLastItemInView
+		App.WaitForElement("26810LastItemButton");
+		App.Click("26810LastItemButton");
+		//Added a new item
+		App.Click("26810AddButton");
+		//Checking Lastitem is visible or not 
+		App.WaitForElement("Item33");
+
+	}
+}
+
+

From 934c2053e3c0fe2c969229ebd2ae40af8398e100 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:54:26 +0530
Subject: [PATCH 12/14] commit for testcase failure

---
 .../Android/ItemsSources/ObservableItemsSource.cs      |  4 ++--
 .../Core/Handlers/Items/Android/MauiRecyclerView.cs    | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableItemsSource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableItemsSource.cs
index 1889e038319e..07c0eefceeb2 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableItemsSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableItemsSource.cs
@@ -229,7 +229,7 @@ internal int ItemsCount()
 		internal object ElementAt(int index)
 		{
 			if (_itemsSource is IList list)
-				return list[index];
+				return (index >= 0 && index < list.Count) ? list[index] : null;
 
 			int count = 0;
 			foreach (var item in _itemsSource)
@@ -239,7 +239,7 @@ internal object ElementAt(int index)
 				count++;
 			}
 
-			return -1;
+			return null;
 		}
 	}
 }
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index f82b6e009691..e0b11f6650ad 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -385,6 +385,11 @@ public virtual void ScrollTo(ScrollToRequestEventArgs args)
 
 			var position = DetermineTargetPosition(args);
 
+			if (position < 0)
+			{
+				return;
+			}
+
 			if (args.IsAnimated)
 			{
 				ScrollHelper.AnimateScrollToPosition(position, args.ScrollToPosition);
@@ -593,7 +598,10 @@ internal void AdjustScrollForItemUpdate()
 			}
 			else if (ItemsView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
 			{
-				ScrollTo(new ScrollToRequestEventArgs(0, 0, Microsoft.Maui.Controls.ScrollToPosition.Start, true));
+				if (GetLayoutManager().ItemCount > 0)
+				{
+					ScrollTo(new ScrollToRequestEventArgs(0, 0, Microsoft.Maui.Controls.ScrollToPosition.Start, true));
+				}
 			}
 		}
 

From 5ae698adac20c4298607fd1418ff54f05013e750 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Tue, 25 Feb 2025 08:51:28 +0530
Subject: [PATCH 13/14] Update ItemsViewLayout.cs

---
 .../src/Core/Handlers/Items/iOS/ItemsViewLayout.cs        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
index 65cbd219d15c..9ee1a47ef2f1 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
@@ -5,6 +5,7 @@
 using CoreGraphics;
 using Foundation;
 using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Controls.Handlers.Items2;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Handlers.Items
@@ -571,6 +572,13 @@ static bool UpdateWillShiftVisibleItems(UICollectionView collectionView, UIColle
 
 		static void ForceScrollToFirstItem(UICollectionView collectionView, ItemsLayout itemsLayout)
 		{
+			//CarouselView and CarouselView2 handle scrolling based on ItemsUpdatingScrollMode in CarouselViewController. Even when passing the 0th index, issues may arise in CarouselView since the position is determined by the center itemindex.
+			// Issue Link : https://github.com/dotnet/maui/issues/25991
+			if (collectionView.DataSource is CarouselViewController || collectionView.DataSource is CarouselViewController2)
+			{
+				return;
+			}
+
 			//Fix Added for ItemsUpdatingScrollMode.KeepItemsInView
 			int sections = (int)collectionView.NumberOfSections();
 

From 8116107d0f4135f7ca37254fd36b3c273ad21534 Mon Sep 17 00:00:00 2001
From: SuthiYuvaraj <92777079+SuthiYuvaraj@users.noreply.github.com>
Date: Mon, 10 Mar 2025 20:43:18 +0530
Subject: [PATCH 14/14] Update
 CollectionViewUITests.CollectionViewItemsUpdatingScrollMode.cs

---
 ...ctionViewUITests.CollectionViewItemsUpdatingScrollMode.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUITests.CollectionViewItemsUpdatingScrollMode.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUITests.CollectionViewItemsUpdatingScrollMode.cs
index 09a8d93c8444..52910baeb5ec 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUITests.CollectionViewItemsUpdatingScrollMode.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUITests.CollectionViewItemsUpdatingScrollMode.cs
@@ -15,7 +15,6 @@ public CollectionViewItemsUpdatingScrollModeUITests(TestDevice device)
 
 		protected override bool ResetAfterEachTest => true;
 
-#if TEST_FAILS_ON_WINDOWS // For more information, see :https://github.com/dotnet/maui/issues/28006
 		// KeepScrollOffset (src\Compatibility\ControlGallery\src\Issues.Shared\CollectionViewItemsUpdatingScrollMode.cs)
 		[Test]
 		[Category(UITestCategories.CollectionView)]
@@ -30,9 +29,9 @@ public void KeepItemsInView()
 				App.Click("AddItemAbove");
 			}
 
-			App.WaitForElement("Vegetables.jpg, 10");
+			App.WaitForNoElement("Vegetables.jpg, 10");
 		}
-#endif
+
 
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // The test fails on iOS and macOS because Appium is unable to locate the Picker control elements resulting in a TimeoutException. For more information, see: https://github.com/dotnet/maui/issues/28024
 		// KeepScrollOffset (src\Compatibility\ControlGallery\src\Issues.Shared\CollectionViewItemsUpdatingScrollMode.cs)