diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
index 2c17a1652bd8..3d576016e031 100644
--- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
@@ -16,6 +16,11 @@
 	<UserControl.Resources>
 		<converters:StringToBrushConverter x:Key="StringToBrushConverter" />
 		<converters:ImageModelToImageConverter x:Key="ImageModelToImageConverter" />
+
+		<!--  Override border on GridViewItem  -->
+		<Thickness x:Key="GridViewItemSelectedBorderThickness">0</Thickness>
+		<SolidColorBrush x:Key="GridViewItemSelectedInnerBorderBrush" Color="Transparent" />
+		<SolidColorBrush x:Key="GridViewItemPointerOverBorderBrush" Color="Transparent" />
 	</UserControl.Resources>
 
 	<!--  Collection of containers  -->
@@ -124,6 +129,7 @@
 						DesiredWidth="180"
 						IsItemClickEnabled="True"
 						ItemClick="FileTagItem_ItemClick"
+						ItemContainerTransitions="{x:Null}"
 						ItemsSource="{x:Bind Tags}"
 						RightTapped="AdaptiveGridView_RightTapped"
 						ScrollViewer.VerticalScrollBarVisibility="Hidden"
@@ -132,6 +138,7 @@
 
 						<wctcontrols:AdaptiveGridView.ItemContainerStyle>
 							<Style BasedOn="{StaticResource DefaultGridViewItemStyle}" TargetType="GridViewItem">
+								<Setter Property="MinHeight" Value="32" />
 								<Setter Property="Padding" Value="8,0" />
 							</Style>
 						</wctcontrols:AdaptiveGridView.ItemContainerStyle>
@@ -150,8 +157,8 @@
 									<!--  Icon  -->
 									<Image
 										Grid.Column="0"
-										Width="20"
-										Height="20"
+										Width="16"
+										Height="16"
 										VerticalAlignment="Center"
 										Source="{x:Bind Icon, Mode=OneWay, Converter={StaticResource ImageModelToImageConverter}}" />