diff --git a/samples/Commerce/Commerce.Shared/App.xaml b/samples/Commerce/Commerce.Shared/App.xaml
index 17a848b73..c177b7e15 100644
--- a/samples/Commerce/Commerce.Shared/App.xaml
+++ b/samples/Commerce/Commerce.Shared/App.xaml
@@ -36,6 +36,7 @@
 			<!-- To override the default FlyoutLightDismissOverlayBackground resource -->
 			<SolidColorBrush x:Key="FlyoutLightDismissOverlayBackground"
 							 Color="{StaticResource MaterialOverlayColor}" />
+			<x:Double x:Key="WideMinWindowWidthh">800</x:Double>
 		</ResourceDictionary>
 	</Application.Resources>
 
diff --git a/samples/Commerce/Commerce.Shared/Views/ProductsPage.xaml b/samples/Commerce/Commerce.Shared/Views/ProductsPage.xaml
index 9e3f10edb..ed622d206 100644
--- a/samples/Commerce/Commerce.Shared/Views/ProductsPage.xaml
+++ b/samples/Commerce/Commerce.Shared/Views/ProductsPage.xaml
@@ -31,7 +31,7 @@
 
 				<VisualState x:Name="Wide">
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowWidth="800" />
+						<AdaptiveTrigger MinWindowWidth="{StaticResource WideMinWindowWidthh}" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="ProductsColumn.Width"
@@ -114,23 +114,38 @@
 								<Grid>
 									<VisualStateManager.VisualStateGroups>
 										<VisualStateGroup>
-											<VisualState x:Name="Narrow" />
-											<VisualState x:Name="Wide">
+										<VisualState x:Name="Narrow">
+											<VisualState.StateTriggers>
+												<AdaptiveTrigger MinWindowWidth="0"
+																 MinWindowHeight="0" />
+											</VisualState.StateTriggers>
+											<VisualState.Setters>
+												<Setter Target="ProductsListView.SelectionMode"
+															Value="None" />
+												<Setter Target="ProductsListView.IsItemClickEnabled"
+															Value="True" />
+											</VisualState.Setters>
+										</VisualState>
+										<VisualState x:Name="Wide">
 												<VisualState.StateTriggers>
-													<AdaptiveTrigger MinWindowWidth="800" />
+												<AdaptiveTrigger MinWindowWidth="{StaticResource WideMinWindowWidthh}" />
 												</VisualState.StateTriggers>
 												<VisualState.Setters>
 													<Setter Target="ProductsListView.SelectionMode"
 															Value="Single" />
+													<Setter Target="ProductsListView.IsItemClickEnabled"
+															Value="False" />
 												</VisualState.Setters>
 											</VisualState>
 										</VisualStateGroup>
 									</VisualStateManager.VisualStateGroups>
 
 								<ListView Background="{StaticResource MaterialSurfaceBrush}"
-									  x:Name="ProductsListView"
-									  ItemsSource="{Binding Data}"
-									  uen:Navigation.Request="ProductDetails">
+										x:Name="ProductsListView"
+										ItemsSource="{Binding Data}"
+										 SelectionMode="None"
+										 IsItemClickEnabled="True"
+										uen:Navigation.Request="ProductDetails">
 									<ListView.ItemsPanel>
 										<ItemsPanelTemplate>
 											<ItemsStackPanel Orientation="Vertical" />