diff --git a/src/Templates/src/templates/maui-mobile/PageModels/MainPageModel.cs b/src/Templates/src/templates/maui-mobile/PageModels/MainPageModel.cs
index d4c6f1ec07cf..cd43c5f03066 100644
--- a/src/Templates/src/templates/maui-mobile/PageModels/MainPageModel.cs
+++ b/src/Templates/src/templates/maui-mobile/PageModels/MainPageModel.cs
@@ -38,6 +38,9 @@ public partial class MainPageModel : ObservableObject, IProjectTaskPageModel
 	[ObservableProperty]
 	private Project? selectedProject;
 
+	[ObservableProperty]
+	private ProjectTask? selectedTask;
+
 	public bool HasCompletedTasks
 		=> Tasks?.Any(t => t.IsCompleted) ?? false;
 
diff --git a/src/Templates/src/templates/maui-mobile/PageModels/ProjectDetailPageModel.cs b/src/Templates/src/templates/maui-mobile/PageModels/ProjectDetailPageModel.cs
index c90875883cdb..42226fba2ed0 100644
--- a/src/Templates/src/templates/maui-mobile/PageModels/ProjectDetailPageModel.cs
+++ b/src/Templates/src/templates/maui-mobile/PageModels/ProjectDetailPageModel.cs
@@ -56,6 +56,9 @@ public partial class ProjectDetailPageModel : ObservableObject, IQueryAttributab
 		new IconData { Icon = FluentUI.bot_24_regular, Description = "Bot Icon" }
 	};
 
+	[ObservableProperty]
+	private ProjectTask? selectedTask;
+
 	private bool _canDelete;
 
 	public bool CanDelete
diff --git a/src/Templates/src/templates/maui-mobile/Pages/Controls/TaskView.xaml b/src/Templates/src/templates/maui-mobile/Pages/Controls/TaskView.xaml
index 1890f42b2edd..9307c842473d 100644
--- a/src/Templates/src/templates/maui-mobile/Pages/Controls/TaskView.xaml
+++ b/src/Templates/src/templates/maui-mobile/Pages/Controls/TaskView.xaml
@@ -10,10 +10,7 @@
     StrokeShape="RoundRectangle 20"
     Background="{AppThemeBinding Light={StaticResource LightSecondaryBackground}, Dark={StaticResource DarkSecondaryBackground}}"
     x:DataType="models:ProjectTask">
-    
-     <effectsView:SfEffectsView
-        TouchDownEffects="Highlight"
-        HighlightBackground="{AppThemeBinding Light={StaticResource DarkOnLightBackground}, Dark={StaticResource LightOnDarkBackground}}">
+
         <shimmer:SfShimmer
             BackgroundColor="Transparent"
             VerticalOptions="Fill"
@@ -44,12 +41,6 @@
                             HorizontalOptions="Start"
                             VerticalOptions="Center"
                             LineBreakMode="WordWrap"/>
-
-                        <Grid.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding NavigateToTaskCommand, Source={RelativeSource AncestorType={x:Type pageModels:IProjectTaskPageModel}}, x:DataType=pageModels:IProjectTaskPageModel}"
-                                CommandParameter="{Binding .}"/>
-                        </Grid.GestureRecognizers>
                     </Grid>
 
                     <CheckBox Grid.Column="0"
@@ -63,5 +54,4 @@
                 </Grid>
             </shimmer:SfShimmer.Content>
         </shimmer:SfShimmer>
-    </effectsView:SfEffectsView>
 </Border>
diff --git a/src/Templates/src/templates/maui-mobile/Pages/MainPage.xaml b/src/Templates/src/templates/maui-mobile/Pages/MainPage.xaml
index a81b719185af..ee24fba15bcf 100644
--- a/src/Templates/src/templates/maui-mobile/Pages/MainPage.xaml
+++ b/src/Templates/src/templates/maui-mobile/Pages/MainPage.xaml
@@ -81,14 +81,23 @@
                                 Command="{Binding CleanTasksCommand}"
                                 SemanticProperties.Description="Clean tasks" />
                         </Grid>
-                        <VerticalStackLayout Grid.Row="5" Spacing="15"
-                            BindableLayout.ItemsSource="{Binding Tasks}">
-                            <BindableLayout.ItemTemplate>
+                        <CollectionView ItemsSource="{Binding Tasks}"
+                                        Grid.Row="5"
+                                        x:Name="TasksCollectionView"
+                                        SelectionMode="Single"
+                                        SelectedItem="{Binding SelectedTask}"
+                                        SelectionChangedCommand="{Binding NavigateToTaskCommand}"
+                                        SelectionChangedCommandParameter="{Binding SelectedTask}">
+                            <CollectionView.ItemsLayout>
+                                <LinearItemsLayout Orientation="Vertical"
+                                                   ItemSpacing="15"/>
+                            </CollectionView.ItemsLayout>
+                            <CollectionView.ItemTemplate>
                                 <DataTemplate>
-                                    <controls:TaskView TaskCompletedCommand="{Binding TaskCompletedCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" />
+                                    <controls:TaskView TaskCompletedCommand="{Binding TaskCompletedCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}"/>
                                 </DataTemplate>
-                            </BindableLayout.ItemTemplate>
-                        </VerticalStackLayout>
+                            </CollectionView.ItemTemplate>
+                        </CollectionView>
                     </Grid>
                 </ScrollView>
             </pullToRefresh:SfPullToRefresh.PullableContent>
diff --git a/src/Templates/src/templates/maui-mobile/Pages/ProjectDetailPage.xaml b/src/Templates/src/templates/maui-mobile/Pages/ProjectDetailPage.xaml
index 798e86c5d0e7..e07ee53f9f2f 100644
--- a/src/Templates/src/templates/maui-mobile/Pages/ProjectDetailPage.xaml
+++ b/src/Templates/src/templates/maui-mobile/Pages/ProjectDetailPage.xaml
@@ -170,15 +170,22 @@
                         SemanticProperties.Description="Clean up"
                         />
                 </Grid>
-                <VerticalStackLayout 
-                    Spacing="{StaticResource LayoutSpacing}"
-                    BindableLayout.ItemsSource="{Binding Tasks}">
-                    <BindableLayout.ItemTemplate>
+                <CollectionView ItemsSource="{Binding Tasks}"
+                                x:Name="ProjectTasksCollectionView"
+                                SelectionMode="Single"
+                                SelectedItem="{Binding SelectedTask}"
+                                SelectionChangedCommand="{Binding NavigateToTaskCommand}"
+                                SelectionChangedCommandParameter="{Binding SelectedTask}">
+                    <CollectionView.ItemsLayout>
+                        <LinearItemsLayout Orientation="Vertical"
+                                           ItemSpacing="{StaticResource LayoutSpacing}"/>
+                    </CollectionView.ItemsLayout>
+                    <CollectionView.ItemTemplate>
                         <DataTemplate>
-                            <controls:TaskView TaskCompletedCommand="{Binding TaskCompletedCommand, Source={RelativeSource AncestorType={x:Type pageModels:ProjectDetailPageModel}}, x:DataType=pageModels:ProjectDetailPageModel}" />
+                            <controls:TaskView TaskCompletedCommand="{Binding TaskCompletedCommand, Source={RelativeSource AncestorType={x:Type pageModels:ProjectDetailPageModel}}, x:DataType=pageModels:ProjectDetailPageModel}"/>
                         </DataTemplate>
-                    </BindableLayout.ItemTemplate>
-                </VerticalStackLayout>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
             </VerticalStackLayout>
         </ScrollView>