diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
index 9dbfe718b0..9029268d2c 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
@@ -33,13 +33,15 @@
             Spacing="8" />
 
         <DataTemplate x:Key="TagTemplate" x:DataType="viewmodels:TagViewModel">
-            <cpcontrols:Tag
-                BackgroundColor="{x:Bind Background, Mode=OneWay}"
-                FontSize="12"
-                ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
-                Icon="{x:Bind Icon, Mode=OneWay}"
-                Text="{x:Bind Text, Mode=OneWay}"
-                ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
+            <ItemContainer>
+                <cpcontrols:Tag
+                    BackgroundColor="{x:Bind Background, Mode=OneWay}"
+                    FontSize="12"
+                    ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
+                    Icon="{x:Bind Icon, Mode=OneWay}"
+                    Text="{x:Bind Text, Mode=OneWay}"
+                    ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
+            </ItemContainer>
         </DataTemplate>
 
         <!--  https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items  -->
@@ -86,11 +88,15 @@
                         Visibility="{x:Bind Subtitle, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
                 </StackPanel>
 
-                <ItemsRepeater
+                <ItemsView
                     Grid.Column="2"
+                    IsHitTestVisible="False"
+                    IsItemInvokedEnabled="False"
+                    IsTabStop="False"
                     ItemTemplate="{StaticResource TagTemplate}"
                     ItemsSource="{x:Bind Tags, Mode=OneWay}"
                     Layout="{StaticResource HorizontalStackLayout}"
+                    SelectionMode="None"
                     Visibility="{x:Bind HasTags, Mode=OneWay}" />
             </Grid>
         </DataTemplate>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
index 4aba2aa131..0b559b3f68 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -40,6 +40,7 @@
 
             <DataTemplate x:Key="TagTemplate" x:DataType="viewModels:TagViewModel">
                 <cpcontrols:Tag
+                    HorizontalAlignment="Left"
                     BackgroundColor="{x:Bind Background, Mode=OneWay}"
                     ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
                     Icon="{x:Bind Icon, Mode=OneWay}"
@@ -89,15 +90,22 @@
                         IsTextSelectionEnabled="True"
                         Text="{x:Bind Key, Mode=OneWay}"
                         TextWrapping="WrapWholeWords" />
-                    <ItemsRepeater
-                        Grid.Column="2"
+                    <ItemsControl
                         ItemTemplate="{StaticResource TagTemplate}"
                         ItemsSource="{x:Bind Tags, Mode=OneWay}"
                         Visibility="{x:Bind HasTags, Mode=OneWay}">
-                        <ItemsRepeater.Layout>
-                            <toolkit:WrapLayout HorizontalSpacing="8" VerticalSpacing="8" />
-                        </ItemsRepeater.Layout>
-                    </ItemsRepeater>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <toolkit:WrapPanel
+                                    x:Name="TagsWrapPanel"
+                                    MinWidth="0"
+                                    Padding="0"
+                                    HorizontalSpacing="8"
+                                    Orientation="Horizontal"
+                                    VerticalSpacing="8" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                    </ItemsControl>
                 </StackPanel>
             </DataTemplate>
         </ResourceDictionary>