diff --git a/samples/todoapp/TodoApp.MAUI/MainPage.xaml b/samples/todoapp/TodoApp.MAUI/MainPage.xaml
index b06b9c36..5d896b7f 100644
--- a/samples/todoapp/TodoApp.MAUI/MainPage.xaml
+++ b/samples/todoapp/TodoApp.MAUI/MainPage.xaml
@@ -21,29 +21,30 @@
         </Grid.ColumnDefinitions>
 
         <!--  List of items  -->
-        <ListView ItemTapped="OnListItemTapped" ItemsSource="{Binding Items}">
-            <ListView.ItemTemplate>
+        <CollectionView
+            ItemsSource="{Binding Items}"
+            SelectionChanged="OnListItemTapped"
+            SelectionMode="Single">
+            <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="models:TodoItem">
-                    <ViewCell>
-                        <Grid Style="{StaticResource listItemContainer}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
+                    <Grid Style="{StaticResource listItemContainer}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
 
-                            <Label Style="{StaticResource listItemTitle}" Text="{Binding Title}" />
-                            <Image
-                                Grid.Column="1"
-                                IsVisible="{Binding IsComplete}"
-                                Style="{StaticResource listItemIcon}" />
-                        </Grid>
-                    </ViewCell>
+                        <Label Style="{StaticResource listItemTitle}" Text="{Binding Title}" />
+                        <Image
+                            Grid.Column="1"
+                            IsVisible="{Binding IsComplete}"
+                            Style="{StaticResource listItemIcon}" />
+                    </Grid>
                 </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
 
         <Grid Grid.Row="1" ColumnDefinitions="*,Auto">
             <Border Grid.Column="0" Style="{StaticResource roundedCornerFrame}">
diff --git a/samples/todoapp/TodoApp.MAUI/MainPage.xaml.cs b/samples/todoapp/TodoApp.MAUI/MainPage.xaml.cs
index ab1cde80..857617ef 100644
--- a/samples/todoapp/TodoApp.MAUI/MainPage.xaml.cs
+++ b/samples/todoapp/TodoApp.MAUI/MainPage.xaml.cs
@@ -24,14 +24,14 @@ protected override void OnAppearing()
         this._viewModel.RefreshItemsCommand.Execute(null);
     }
 
-    public void OnListItemTapped(object sender, ItemTappedEventArgs e)
+    public void OnListItemTapped(object sender, SelectionChangedEventArgs e)
     {
-        if (e.Item is TodoItem item)
+        if (e.CurrentSelection.FirstOrDefault() is TodoItem item)
         {
             this._viewModel.UpdateItemCommand.Execute(item.Id);
         }
 
-        if (sender is ListView itemList)
+        if (sender is CollectionView itemList)
         {
             itemList.SelectedItem = null;
         }
diff --git a/samples/todoapp/TodoApp.MAUI/Resources/Styles/Styles.xaml b/samples/todoapp/TodoApp.MAUI/Resources/Styles/Styles.xaml
index cd05dbfc..57da6f1a 100644
--- a/samples/todoapp/TodoApp.MAUI/Resources/Styles/Styles.xaml
+++ b/samples/todoapp/TodoApp.MAUI/Resources/Styles/Styles.xaml
@@ -278,11 +278,6 @@
         <Setter Property="HorizontalTextAlignment" Value="Center" />
     </Style>
 
-    <Style TargetType="ListView">
-        <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
     <Style TargetType="Picker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />