diff --git a/.gitignore b/.gitignore
index 1408c92..68f4899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -350,4 +350,4 @@ MigrationBackup/
 .ionide/
 .DS_Store
 
-.idea/
\ No newline at end of file
+.idea/
diff --git a/README.md b/README.md
index edf5c6c..82bec0d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # VirtualListView for .NET MAUI
 This is an experiment in creating a virtualized ListView control for .NET MAUI to support simple, fast, multi-templated, uneven item sized lists by not adding too many bells and whistles and using an adapter pattern data source.
 
-![Nuget: Redth.Maui.VirtualListView](https://img.shields.io/nuget/vpre/Redth.Maui.VirtualListView?logo=nuget&label=Redth.Maui.VirtualListView&color=004880&link=https%3A%2F%2Fwww.nuget.org%2Fpackages%2FRedth.Maui.VirtualListView%2F)
+[![Nuget: Redth.Maui.VirtualListView](https://img.shields.io/nuget/vpre/Redth.Maui.VirtualListView?logo=nuget&label=Redth.Maui.VirtualListView&color=004880&link=https%3A%2F%2Fwww.nuget.org%2Fpackages%2FRedth.Maui.VirtualListView%2F)](https://www.nuget.org/packages/Redth.Maui.VirtualListView)
 
 
 ## Vroooom!
diff --git a/Sample/VirtualListViewSample/MusicLibraryPage.xaml b/Sample/VirtualListViewSample/MusicLibraryPage.xaml
index 45ad698..508391c 100644
--- a/Sample/VirtualListViewSample/MusicLibraryPage.xaml
+++ b/Sample/VirtualListViewSample/MusicLibraryPage.xaml
@@ -72,6 +72,15 @@
 				<Label Padding="20" Text="That's all folks!" TextColor="White" HorizontalOptions="Center" />
 			</Grid>
 		</vlv:VirtualListView.GlobalFooter>
+		
+		<vlv:VirtualListView.EmptyView>
+			<Grid>
+				<Label
+					VerticalOptions="Center"
+					HorizontalOptions="Center"
+					Text="No Items" />
+			</Grid>
+		</vlv:VirtualListView.EmptyView>
 	</vlv:VirtualListView>
 
 </ContentPage>
\ No newline at end of file
diff --git a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml
index d03a053..287a050 100644
--- a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml
+++ b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml
@@ -10,6 +10,8 @@
 		<vlv:VirtualListView
 			Grid.Row="0"
 			Grid.Column="0" Grid.ColumnSpan="3"
+			IsRefreshEnabled="False"
+			OnRefresh="Vlv_OnOnRefresh"
 			x:Name="vlv"
 			OnSelectedItemsChanged="vlv_SelectedItemsChanged"
 			SelectionMode="Single">
diff --git a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs
index 12e3944..b7dbc9e 100644
--- a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs
+++ b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs
@@ -47,4 +47,10 @@ private void vlv_SelectedItemsChanged(object sender, SelectedItemsChangedEventAr
 		}
 	
 	}
+
+	private async void Vlv_OnOnRefresh(object sender, RefreshEventArgs e)
+	{
+		await Task.Delay(3000);
+		e.Complete();
+	}
 }
diff --git a/VirtualListView/Adapters/VirtualListViewAdapterBase.cs b/VirtualListView/Adapters/VirtualListViewAdapterBase.cs
index f3a1154..4c54722 100644
--- a/VirtualListView/Adapters/VirtualListViewAdapterBase.cs
+++ b/VirtualListView/Adapters/VirtualListViewAdapterBase.cs
@@ -2,7 +2,12 @@
 
 public abstract class VirtualListViewAdapterBase<TSection, TItem> : IVirtualListViewAdapter
 {
-	public virtual int GetNumberOfSections() => 1;
+	// This adapter assumes we only ever have 1 section
+	// however we really want to return 0 if there's no items at all
+	// So, ask the derived class how many items might be in the first
+	// section and if any, we return 1 section otherwise 0
+	public virtual int GetNumberOfSections() =>
+		GetNumberOfItemsInSection(0) > 0 ? 1 : 0;
 
 	public event EventHandler OnDataInvalidated;
 
diff --git a/VirtualListView/Apple/CvCell.ios.maccatalyst.cs b/VirtualListView/Apple/CvCell.ios.maccatalyst.cs
index 4205950..ceba312 100644
--- a/VirtualListView/Apple/CvCell.ios.maccatalyst.cs
+++ b/VirtualListView/Apple/CvCell.ios.maccatalyst.cs
@@ -7,6 +7,8 @@ namespace Microsoft.Maui;
 
 internal class CvCell : UICollectionViewCell
 {
+	internal const string ReuseIdUnknown = "UNKNOWN";
+	
 	public VirtualListViewHandler Handler { get; set; }
 
 	public WeakReference<NSIndexPath> IndexPath { get; set; }
diff --git a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
index be6bf5a..2d2dd99 100644
--- a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
+++ b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
@@ -1,4 +1,5 @@
-using Foundation;
+#nullable enable
+using Foundation;
 using UIKit;
 
 namespace Microsoft.Maui;
@@ -20,54 +21,74 @@ public CvDataSource(VirtualListViewHandler handler)
 
 	public override nint NumberOfSections(UICollectionView collectionView)
 		=> 1;
-
+	
 	public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
 	{
 		var info = Handler?.PositionalViewSelector?.GetInfo(indexPath.Item.ToInt32());
 
-		var data = Handler?.PositionalViewSelector?.Adapter?.DataFor(info.Kind, info.SectionIndex, info.ItemIndex);
-
-		var reuseId = Handler?.PositionalViewSelector?.ViewSelector?.GetReuseId(info, data);
+		object? data = null;
 
-		var nativeReuseId = info.Kind switch
+		var nativeReuseId = CvCell.ReuseIdUnknown;
+		
+		if (info is not null)
 		{
-			PositionKind.Item => itemIdManager.GetReuseId(collectionView, reuseId),
-			PositionKind.SectionHeader => sectionHeaderIdManager.GetReuseId(collectionView, reuseId),
-			PositionKind.SectionFooter => sectionFooterIdManager.GetReuseId(collectionView, reuseId),
-			PositionKind.Header => globalIdManager.GetReuseId(collectionView, reuseId),
-			PositionKind.Footer => globalIdManager.GetReuseId(collectionView, reuseId),
-			_ => "UNKNOWN",
-		};
-
-		var cell = (collectionView.DequeueReusableCell(nativeReuseId, indexPath) as CvCell)!;
+			data = Handler?.PositionalViewSelector?.Adapter?.DataFor(info.Kind, info.SectionIndex, info.ItemIndex);
+
+			if (data is not null)
+			{
+				var reuseId = Handler?.PositionalViewSelector?.ViewSelector?.GetReuseId(info, data);
+
+				nativeReuseId = info.Kind switch
+				{
+					PositionKind.Item => itemIdManager.GetReuseId(collectionView, reuseId),
+					PositionKind.SectionHeader => sectionHeaderIdManager.GetReuseId(collectionView, reuseId),
+					PositionKind.SectionFooter => sectionFooterIdManager.GetReuseId(collectionView, reuseId),
+					PositionKind.Header => globalIdManager.GetReuseId(collectionView, reuseId),
+					PositionKind.Footer => globalIdManager.GetReuseId(collectionView, reuseId),
+					_ => CvCell.ReuseIdUnknown,
+				};
+			}
+		}
+
+		var nativeCell = collectionView.DequeueReusableCell(nativeReuseId, indexPath);
+		if (nativeCell is not CvCell cell)
+			return (UICollectionViewCell)nativeCell;
+		
 		cell.SetTapHandlerCallback(TapCellHandler);
 		cell.Handler = Handler;
 		cell.IndexPath = new WeakReference<NSIndexPath>(indexPath);
 
 		cell.ReuseCallback = new WeakReference<Action<IView>>((rv) =>
 		{
-			if (cell?.VirtualView?.TryGetTarget(out var cellVirtualView) ?? false)
-				Handler.VirtualView.ViewSelector.ViewDetached(info, cellVirtualView);
+			if (info is not null && (cell.VirtualView?.TryGetTarget(out var cellView) ?? false))
+				Handler?.VirtualView?.ViewSelector?.ViewDetached(info, cellView);
 		});
 
-		if (info.SectionIndex < 0 || info.ItemIndex < 0)
-			info.IsSelected = false;
-		else
-			info.IsSelected = Handler?.IsItemSelected(info.SectionIndex, info.ItemIndex) ?? false;
+		if (info is not null)
+		{
+			if (info.SectionIndex < 0 || info.ItemIndex < 0)
+				info.IsSelected = false;
+			else
+				info.IsSelected = Handler?.IsItemSelected(info.SectionIndex, info.ItemIndex) ?? false;
+		}
 
-		if (cell.NeedsView)
+		if (cell.NeedsView && info is not null && data is not null)
 		{
 			var view = Handler?.PositionalViewSelector?.ViewSelector?.CreateView(info, data);
-			cell.SetupView(view);
+			if (view is not null)
+				cell.SetupView(view);
 		}
 
-		cell.UpdatePosition(info);
-
-		if (cell.VirtualView.TryGetTarget(out var cellVirtualView))
+		if (info is not null)
 		{
-			Handler?.PositionalViewSelector?.ViewSelector?.RecycleView(info, data, cellVirtualView);
+			cell.UpdatePosition(info);
+
+			if (data is not null && (cell.VirtualView?.TryGetTarget(out var cellVirtualView) ?? false))
+			{
+				Handler?.PositionalViewSelector?.ViewSelector?.RecycleView(info, data, cellVirtualView);
 
-			Handler.VirtualView.ViewSelector.ViewAttached(info, cellVirtualView);
+				Handler?.VirtualView?.ViewSelector?.ViewAttached(info, cellVirtualView);
+			}
 		}
 
 		return cell;
diff --git a/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs b/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs
index c67e3f9..b1deabe 100644
--- a/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs
+++ b/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs
@@ -11,12 +11,13 @@ public CvDelegate(VirtualListViewHandler handler, UICollectionView collectionVie
 	{
 		Handler = handler;
 		NativeCollectionView = new WeakReference<UICollectionView>(collectionView);
+		collectionView.RegisterClassForCell(typeof(CvCell), CvCell.ReuseIdUnknown);
 	}
 
 	internal readonly WeakReference<UICollectionView> NativeCollectionView;
 	internal readonly VirtualListViewHandler Handler;
 
-	public WeakReference<Action<NFloat, NFloat>> ScrollHandler { get; set; }
+	public Action<NFloat, NFloat> ScrollHandler { get; set; }
 
 	public override void ItemSelected(UICollectionView collectionView, NSIndexPath indexPath)
 		=> HandleSelection(collectionView, indexPath, true);
@@ -27,27 +28,28 @@ public override void ItemDeselected(UICollectionView collectionView, NSIndexPath
 	void HandleSelection(UICollectionView collectionView, NSIndexPath indexPath, bool selected)
 	{
 		//UIView.AnimationsEnabled = false;
-		var selectedCell = collectionView.CellForItem(indexPath) as CvCell;
-
-		if ((selectedCell?.PositionInfo?.Kind ?? PositionKind.Header) == PositionKind.Item)
+		if (collectionView.CellForItem(indexPath) is CvCell selectedCell
+		    && (selectedCell.PositionInfo?.Kind ?? PositionKind.Header) == PositionKind.Item)
 		{
 			selectedCell.UpdateSelected(selected);
 
-			var itemPos = new ItemPosition(
-				selectedCell.PositionInfo.SectionIndex,
-				selectedCell.PositionInfo.ItemIndex);
+			if (selectedCell.PositionInfo is not null)
+			{
+				var itemPos = new ItemPosition(
+					selectedCell.PositionInfo.SectionIndex,
+					selectedCell.PositionInfo.ItemIndex);
 
-			if (selected)
-				Handler?.VirtualView?.SelectItem(itemPos);
-			else
-				Handler?.VirtualView?.DeselectItem(itemPos);
+				if (selected)
+					Handler?.VirtualView?.SelectItem(itemPos);
+				else
+					Handler?.VirtualView?.DeselectItem(itemPos);
+			}
 		}
 	}
 
 	public override void Scrolled(UIScrollView scrollView)
 	{
-		if (ScrollHandler?.TryGetTarget(out var handler) ?? false)
-			handler?.Invoke(scrollView.ContentOffset.X, scrollView.ContentOffset.Y);
+		ScrollHandler?.Invoke(scrollView.ContentOffset.X, scrollView.ContentOffset.Y);
 	}
 
 	public override bool ShouldSelectItem(UICollectionView collectionView, NSIndexPath indexPath)
diff --git a/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs b/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs
index 90a5579..1221095 100644
--- a/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs
+++ b/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs
@@ -36,13 +36,21 @@ protected override UICollectionView CreatePlatformView()
 
 
 		refreshControl = new UIRefreshControl();
+		refreshControl.Enabled = VirtualView?.IsRefreshEnabled ?? false;
 		refreshControl.AddTarget(new EventHandler((s, a) =>
 		{
 			refreshControl.BeginRefreshing();
-			VirtualView?.Refresh(() => refreshControl.EndRefreshing());
+			try
+			{
+				VirtualView?.Refresh(() => refreshControl.EndRefreshing());
+			}
+			catch
+			{
+				refreshControl.EndRefreshing();
+			}
 		}), UIControlEvent.ValueChanged);
 
-		collectionView.AddSubview(refreshControl);
+		//collectionView.AddSubview(refreshControl);
 
 		collectionView.AlwaysBounceVertical = true;
 
@@ -62,8 +70,7 @@ protected override void ConnectHandler(UICollectionView nativeView)
 		dataSource = new CvDataSource(this);
 		
 		cvdelegate = new CvDelegate(this, nativeView);
-		cvdelegate.ScrollHandler = new WeakReference<Action<System.Runtime.InteropServices.NFloat, System.Runtime.InteropServices.NFloat>>((x, y) =>
-			VirtualView?.Scrolled(x, y));
+		cvdelegate.ScrollHandler = (x, y) => VirtualView?.Scrolled(x, y);
 
 		nativeView.DataSource = dataSource;
 		nativeView.Delegate = cvdelegate;
@@ -176,8 +183,20 @@ public static void MapRefreshAccentColor(VirtualListViewHandler handler, IVirtua
 
 	public static void MapIsRefreshEnabled(VirtualListViewHandler handler, IVirtualListView virtualListView)
 	{
+		var isRefreshEnabled = virtualListView?.IsRefreshEnabled ?? false;
 		if (handler.refreshControl is not null)
-			handler.refreshControl.Enabled = virtualListView.IsRefreshEnabled;
+		{
+			if (isRefreshEnabled)
+			{
+				handler.PlatformView.AddSubview(handler.refreshControl);
+				handler.refreshControl.Enabled = true;
+			}
+			else
+			{
+				handler.refreshControl.Enabled = false;
+				handler.refreshControl.RemoveFromSuperview();
+			}
+		}
 	}
 
 
diff --git a/VirtualListView/Controls/VirtualListView.cs b/VirtualListView/Controls/VirtualListView.cs
index fda0aa0..4eb3371 100644
--- a/VirtualListView/Controls/VirtualListView.cs
+++ b/VirtualListView/Controls/VirtualListView.cs
@@ -1,6 +1,6 @@
 using System.Windows.Input;
-using Microsoft.Maui.Adapters;
-
+using Microsoft.Maui.Adapters;
+
 namespace Microsoft.Maui.Controls;
 
 public partial class VirtualListView : View, IVirtualListView, IVirtualListViewSelector
@@ -30,13 +30,13 @@ public IView GlobalHeader
 	public static readonly BindableProperty GlobalHeaderProperty =
 		BindableProperty.Create(nameof(GlobalHeader), typeof(IView), typeof(VirtualListView), default);
 
-	public bool IsHeaderVisible
-	{
-		get => (bool)GetValue(IsHeaderVisibleProperty);
-		set => SetValue(IsHeaderVisibleProperty, value);
-	}
-
-	public static readonly BindableProperty IsHeaderVisibleProperty =
+	public bool IsHeaderVisible
+	{
+		get => (bool)GetValue(IsHeaderVisibleProperty);
+		set => SetValue(IsHeaderVisibleProperty, value);
+	}
+
+	public static readonly BindableProperty IsHeaderVisibleProperty =
 		BindableProperty.Create(nameof(IsHeaderVisible), typeof(bool), typeof(VirtualListView), true);
 
 	public IView GlobalFooter
@@ -49,14 +49,14 @@ public IView GlobalFooter
 		BindableProperty.Create(nameof(GlobalFooter), typeof(IView), typeof(VirtualListView), default);
 
 
-	public bool IsFooterVisible
-	{
-		get => (bool)GetValue(IsFooterVisibleProperty);
-		set => SetValue(IsFooterVisibleProperty, value);
-	}
-
-	public static readonly BindableProperty IsFooterVisibleProperty =
-		BindableProperty.Create(nameof(IsFooterVisible), typeof(bool), typeof(VirtualListView), true);
+	public bool IsFooterVisible
+	{
+		get => (bool)GetValue(IsFooterVisibleProperty);
+		set => SetValue(IsFooterVisibleProperty, value);
+	}
+
+	public static readonly BindableProperty IsFooterVisibleProperty =
+		BindableProperty.Create(nameof(IsFooterVisible), typeof(bool), typeof(VirtualListView), true);
 
 
 	public DataTemplate ItemTemplate
@@ -148,26 +148,26 @@ public ICommand RefreshCommand
 	}
 
 	public static readonly BindableProperty RefreshCommandProperty =
-		BindableProperty.Create(nameof(RefreshCommand), typeof(ICommand), typeof(VirtualListView), default);
-
-	public Color RefreshAccentColor
-	{
-		get => (Color)GetValue(RefreshAccentColorProperty);
-		set => SetValue(RefreshAccentColorProperty, value);
-	}
-
-	public static readonly BindableProperty RefreshAccentColorProperty =
-		BindableProperty.Create(nameof(RefreshAccentColor), typeof(Color), typeof(VirtualListView), null);
-
-	public bool IsRefreshEnabled
-	{
-		get => (bool)GetValue(IsRefreshEnabledProperty);
-		set => SetValue(IsRefreshEnabledProperty, value);
-	}
-
-	public static readonly BindableProperty IsRefreshEnabledProperty =
-		BindableProperty.Create(nameof(IsRefreshEnabled), typeof(bool), typeof(VirtualListView), false);
-
+		BindableProperty.Create(nameof(RefreshCommand), typeof(ICommand), typeof(VirtualListView), default);
+
+	public Color RefreshAccentColor
+	{
+		get => (Color)GetValue(RefreshAccentColorProperty);
+		set => SetValue(RefreshAccentColorProperty, value);
+	}
+
+	public static readonly BindableProperty RefreshAccentColorProperty =
+		BindableProperty.Create(nameof(RefreshAccentColor), typeof(Color), typeof(VirtualListView), null);
+
+	public bool IsRefreshEnabled
+	{
+		get => (bool)GetValue(IsRefreshEnabledProperty);
+		set => SetValue(IsRefreshEnabledProperty, value);
+	}
+
+	public static readonly BindableProperty IsRefreshEnabledProperty =
+		BindableProperty.Create(nameof(IsRefreshEnabled), typeof(bool), typeof(VirtualListView), false);
+
 	public ListOrientation Orientation
 	{
 		get => (ListOrientation)GetValue(OrientationProperty);
@@ -178,25 +178,25 @@ public ListOrientation Orientation
 		BindableProperty.Create(nameof(Orientation), typeof(ListOrientation), typeof(VirtualListView), ListOrientation.Vertical);
 
 
-	public View EmptyView
-	{
-		get => (View)GetValue(EmptyViewProperty);
-		set => SetValue(EmptyViewProperty, value);
-	}
-
-	public static readonly BindableProperty EmptyViewProperty =
-		BindableProperty.Create(nameof(EmptyView), typeof(View), typeof(VirtualListView), null,
-			propertyChanged: (bobj, oldValue, newValue) =>
-			{
-				if (bobj is VirtualListView virtualListView)
-				{
-					if (oldValue is IView oldView)
-						virtualListView.RemoveLogicalChild(oldView);
-
-					if (newValue is IView newView)
-						virtualListView.AddLogicalChild(newView);
-				}
-			});
+	public View EmptyView
+	{
+		get => (View)GetValue(EmptyViewProperty);
+		set => SetValue(EmptyViewProperty, value);
+	}
+
+	public static readonly BindableProperty EmptyViewProperty =
+		BindableProperty.Create(nameof(EmptyView), typeof(View), typeof(VirtualListView), null,
+			propertyChanged: (bobj, oldValue, newValue) =>
+			{
+				if (bobj is VirtualListView virtualListView)
+				{
+					if (oldValue is IView oldView)
+						virtualListView.RemoveLogicalChild(oldView);
+
+					if (newValue is IView newView)
+						virtualListView.AddLogicalChild(newView);
+				}
+			});
 
 	IView IVirtualListView.EmptyView => EmptyView;
 
@@ -225,46 +225,46 @@ public ICommand ScrolledCommand
 	{
 		get => (ICommand)GetValue(ScrolledCommandProperty);
 		set => SetValue(ScrolledCommandProperty, value);
-	}
-
+	}
+
 	public static readonly BindableProperty SelectedItemsProperty =
-		BindableProperty.Create(nameof(SelectedItems), typeof(IList<ItemPosition>), typeof(VirtualListView), Array.Empty<ItemPosition>(),
-			propertyChanged: (bindableObj, oldValue, newValue) =>
-			{
-				if (bindableObj is VirtualListView vlv
-					&& oldValue is IList<ItemPosition> oldSelection
-					&& newValue is IList<ItemPosition> newSelection)
-				{
-					vlv.RaiseSelectedItemsChanged(oldSelection.ToArray(), newSelection.ToArray());
-				}
-			});
-	public IList<ItemPosition> SelectedItems
-	{
-		get => (IList<ItemPosition>)GetValue(SelectedItemsProperty);
-		set => SetValue(SelectedItemsProperty, value ?? Array.Empty<ItemPosition>());
-	}
-
+		BindableProperty.Create(nameof(SelectedItems), typeof(IList<ItemPosition>), typeof(VirtualListView), Array.Empty<ItemPosition>(),
+			propertyChanged: (bindableObj, oldValue, newValue) =>
+			{
+				if (bindableObj is VirtualListView vlv
+					&& oldValue is IList<ItemPosition> oldSelection
+					&& newValue is IList<ItemPosition> newSelection)
+				{
+					vlv.RaiseSelectedItemsChanged(oldSelection.ToArray(), newSelection.ToArray());
+				}
+			});
+	public IList<ItemPosition> SelectedItems
+	{
+		get => (IList<ItemPosition>)GetValue(SelectedItemsProperty);
+		set => SetValue(SelectedItemsProperty, value ?? Array.Empty<ItemPosition>());
+	}
+
 	public static readonly BindableProperty SelectedItemProperty =
-		BindableProperty.Create(nameof(SelectedItem), typeof(ItemPosition?), typeof(VirtualListView), default,
-			propertyChanged: (bindableObj, oldValue, newValue) =>
-			{
-				if (bindableObj is VirtualListView vlv)
-				{
-					if (newValue is null || newValue is not ItemPosition)
-						vlv.SelectedItems = null;
-					else if (newValue is ItemPosition p)
-						vlv.SelectedItems = new[] { p };
-				}
+		BindableProperty.Create(nameof(SelectedItem), typeof(ItemPosition?), typeof(VirtualListView), default,
+			propertyChanged: (bindableObj, oldValue, newValue) =>
+			{
+				if (bindableObj is VirtualListView vlv)
+				{
+					if (newValue is null || newValue is not ItemPosition)
+						vlv.SelectedItems = null;
+					else if (newValue is ItemPosition p)
+						vlv.SelectedItems = new[] { p };
+				}
 			});
 
-	public ItemPosition? SelectedItem
-	{
-		get => (ItemPosition?)GetValue(SelectedItemProperty);
-		set => SetValue(SelectedItemProperty, value);
-	}
-
+	public ItemPosition? SelectedItem
+	{
+		get => (ItemPosition?)GetValue(SelectedItemProperty);
+		set => SetValue(SelectedItemProperty, value);
+	}
+
 
-	public void DeselectItem(ItemPosition itemPosition)
+	public void DeselectItem(ItemPosition itemPosition)
 	{
 		if (SelectionMode == Maui.SelectionMode.Single)
 		{
@@ -280,17 +280,17 @@ public void DeselectItem(ItemPosition itemPosition)
 			{
 				current.Remove(itemPosition);
 				SelectedItems = current.ToArray();
-			}
-		}
+			}
+		}
 	}
 
-	public void SelectItem(ItemPosition itemPosition)
+	public void SelectItem(ItemPosition itemPosition)
 	{
 		if (SelectionMode == Maui.SelectionMode.Single)
 		{
-			if (!SelectedItem.HasValue || !SelectedItem.Value.Equals(itemPosition))
-			{
-				SelectedItem = itemPosition;
+			if (!SelectedItem.HasValue || !SelectedItem.Value.Equals(itemPosition))
+			{
+				SelectedItem = itemPosition;
 			}
 		}
 		else if (SelectionMode == Maui.SelectionMode.Multiple)
@@ -300,15 +300,15 @@ public void SelectItem(ItemPosition itemPosition)
 			{
 				SelectedItems = current.Append(itemPosition).ToArray();
 			}
-		}
+		}
 	}
 
-	public void ClearSelectedItems()
+	public void ClearSelectedItems()
 	{
 		if (SelectionMode == Maui.SelectionMode.Multiple)
-			SelectedItems = null;
-		else
-			SelectedItem = null;
+			SelectedItems = null;
+		else
+			SelectedItem = null;
 	}
 
 	public void ScrollToItem(ItemPosition itemPosition, bool animated)
@@ -321,9 +321,9 @@ public bool SectionHasFooter(int sectionIndex)
 		=> SectionFooterTemplateSelector != null || SectionFooterTemplate != null;
 
 	public IView CreateView(PositionInfo position, object data)
-		=> position.Kind switch
+		=> position.Kind switch
 		{
-			PositionKind.Item =>
+			PositionKind.Item =>
 				ItemTemplateSelector?.SelectTemplate(data, position.SectionIndex, position.ItemIndex)?.CreateContent() as View
 					?? ItemTemplate?.CreateContent() as View,
 			PositionKind.SectionHeader =>
@@ -378,9 +378,9 @@ public void ViewDetached(PositionInfo position, IView view)
 		=> this.RemoveLogicalChild(view);
 
 	public void ViewAttached(PositionInfo position, IView view)
-		=> this.AddLogicalChild(view);
-
-	void RaiseSelectedItemsChanged(ItemPosition[] previousSelection, ItemPosition[] newSelection)
+		=> this.AddLogicalChild(view);
+
+	void RaiseSelectedItemsChanged(ItemPosition[] previousSelection, ItemPosition[] newSelection)
 		=> this.OnSelectedItemsChanged?.Invoke(this, new SelectedItemsChangedEventArgs(previousSelection, newSelection));
 
 }
diff --git a/VirtualListView/PositionalViewSelector.cs b/VirtualListView/PositionalViewSelector.cs
index 4cd3ee3..8b93b4a 100644
--- a/VirtualListView/PositionalViewSelector.cs
+++ b/VirtualListView/PositionalViewSelector.cs
@@ -28,12 +28,32 @@ int GetTotalCount()
 	{
 		var sum = 0;
 
-		if (HasGlobalHeader)
-			sum += 1;
+		var hasAtLeastOneItem = false;
+		var numberOfSections = Adapter.GetNumberOfSections();
+
+		if (HasGlobalHeader && numberOfSections > 0)
+		{
+			// Make sure that there's at least one section with at least
+			// one item, otherwise it's 'empty'
+			// The default adapter may always return 1 for number of sections
+			// so it's not enough to check that
+			for (int s = 0; s < numberOfSections; s++)
+			{
+				if (Adapter.GetNumberOfItemsInSection(s) > 0)
+				{
+					sum += 1;
+					// If we found one, we can stop looping
+					// since we just care to calculate a spot
+					// for the header cell if the adapter isn't empty
+					hasAtLeastOneItem = true;
+					break;
+				}
+			}
+		}
 
 		if (Adapter != null)
 		{
-			for (int s = 0; s < Adapter.GetNumberOfSections(); s++)
+			for (int s = 0; s < numberOfSections; s++)
 			{
 				if (ViewSelector.SectionHasHeader(s))
 					sum += 1;
@@ -45,7 +65,9 @@ int GetTotalCount()
 			}
 		}
 
-		if (HasGlobalFooter)
+		// Only count footer if there is already at least one item
+		// otherwise the adapter is empty and we shouldn't count it
+		if (HasGlobalFooter && hasAtLeastOneItem)
 			sum += 1;
 
 		return sum;