diff --git a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
index e407c0a96ff9..46c8e297019a 100644
--- a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
@@ -108,7 +108,7 @@ protected virtual void UpdateHeader()
 				_currentHeader = null;
 			}
 
-			var header = ItemsView.Header;
+			var header = ItemsView.Header ?? ItemsView.HeaderTemplate;
 
 			switch (header)
 			{
@@ -133,7 +133,7 @@ protected virtual void UpdateHeader()
 					if (headerTemplate != null)
 					{
 						ListViewBase.HeaderTemplate = ItemsViewTemplate;
-						ListViewBase.Header = new ItemTemplateContext(headerTemplate, header, Element);
+						ListViewBase.Header = new ItemTemplateContext(headerTemplate, header, Element, mauiContext: MauiContext);
 					}
 					else
 					{
@@ -157,7 +157,7 @@ protected virtual void UpdateFooter()
 				_currentFooter = null;
 			}
 
-			var footer = ItemsView.Footer;
+			var footer = ItemsView.Footer ?? ItemsView.FooterTemplate;
 
 			switch (footer)
 			{
@@ -182,7 +182,7 @@ protected virtual void UpdateFooter()
 					if (footerTemplate != null)
 					{
 						ListViewBase.FooterTemplate = ItemsViewTemplate;
-						ListViewBase.Footer = new ItemTemplateContext(footerTemplate, footer, Element);
+						ListViewBase.Footer = new ItemTemplateContext(footerTemplate, footer, Element, mauiContext: MauiContext);
 					}
 					else
 					{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8761.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue8761.xaml
index b093c85df938..7976b40e06e0 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8761.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8761.xaml
@@ -2,9 +2,7 @@
 <ContentPage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiCollectionViewFooterBug"
     x:Class="Maui.Controls.Sample.Issues.Issue8761">
-
     <CollectionView ItemsSource="{Binding Items}">
         <CollectionView.HeaderTemplate>
             <DataTemplate>
@@ -33,5 +31,4 @@
             </DataTemplate>
         </CollectionView.FooterTemplate>
     </CollectionView>
-
 </ContentPage>
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs
index bb9b39dcfc9a..a458170cc916 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs
@@ -1,6 +1,4 @@
-#if ANDROID
-// https://github.com/dotnet/maui/issues/22892
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -25,5 +23,4 @@ public void CollectionViewHeaderTemplateAndFooterTemplateDontWork()
 			App.WaitForElement("FooterLabel");
 		}
 	}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file