diff --git a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
index c11422fa..1e02967a 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
@@ -33,30 +33,40 @@
 
         <UniformGrid
             Grid.Row="2"
-            Margin="16"
-            HorizontalAlignment="Right"
+            Margin="8"
             Columns="{Binding ButtonsCount}">
             <!--  OK  -->
             <Button
+                Margin="8"
+                HorizontalContentAlignment="Stretch"
                 Command="{Binding CloseCommand}"
-                Content="{Binding DefaultButtonText}"
                 IsDefault="True"
                 IsVisible="{Binding IsDefaultButtonVisible}"
-                Theme="{DynamicResource MaterialOutlineButton}">
+                Theme="{DynamicResource MaterialOutlineButton}"
+                ToolTip.Tip="{Binding DefaultButtonText}">
                 <Button.CommandParameter>
                     <system:Boolean>True</system:Boolean>
                 </Button.CommandParameter>
+                <TextBlock
+                    Text="{Binding DefaultButtonText}"
+                    TextAlignment="Center"
+                    TextTrimming="CharacterEllipsis" />
             </Button>
 
             <!--  Cancel  -->
             <Button
-                Margin="16,0,0,0"
-                HorizontalAlignment="Stretch"
+                Margin="8"
+                HorizontalContentAlignment="Stretch"
                 Command="{Binding CloseCommand}"
-                Content="{Binding CancelButtonText}"
                 IsCancel="True"
                 IsVisible="{Binding IsCancelButtonVisible}"
-                Theme="{DynamicResource MaterialOutlineButton}" />
+                Theme="{DynamicResource MaterialOutlineButton}"
+                ToolTip.Tip="{Binding CancelButtonText}">
+                <TextBlock
+                    Text="{Binding CancelButtonText}"
+                    TextAlignment="Center"
+                    TextTrimming="CharacterEllipsis" />
+            </Button>
         </UniformGrid>
     </Grid>
 </UserControl>
\ No newline at end of file