diff --git a/src/Core/Controls/AccountViewCell/AccountViewCell.xaml b/src/Core/Controls/AccountViewCell/AccountViewCell.xaml
index 6cf828773..408047e29 100644
--- a/src/Core/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/Core/Controls/AccountViewCell/AccountViewCell.xaml
@@ -58,10 +58,6 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
                 <Label
                     Grid.Row="0"
                     Text="{Binding AccountView.Email}"
diff --git a/src/Core/Controls/CipherViewCell/CipherViewCell.xaml b/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
index d86a61f39..79a7c85e4 100644
--- a/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
@@ -64,23 +64,25 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <Label 
-            LineBreakMode="TailTruncation"
             Grid.Column="0"
             Grid.Row="0"
+            HorizontalTextAlignment="Start"
+            LineBreakMode="TailTruncation"
             StyleClass="list-title, list-title-platform"
             Text="{Binding Cipher.Name}"
             AutomationId="CipherNameLabel" />
         <Label
-            LineBreakMode="TailTruncation"
             Grid.Column="0"
             Grid.Row="1"
             Grid.ColumnSpan="3"
+            HorizontalTextAlignment="Start"
+            LineBreakMode="TailTruncation"
             StyleClass="list-subtitle, list-subtitle-platform"
             Text="{Binding Cipher.SubTitle}"
             IsVisible="{Binding Source={RelativeSource Self}, Path=Text,