diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 82970549..fd4cac0c 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -164,6 +164,7 @@
   <Style Selector="ToolTip">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Popup}"/>
+    <Setter Property="MaxWidth" Value="800"/>
     <Setter Property="VerticalOffset" Value="-8"/>
     <Setter Property="TextBlock.TextDecorations" Value=""/>
     <Setter Property="Template">
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index d850932c..2ab64525 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -73,12 +73,6 @@
             </Button>
 
             <ContentControl Content="{Binding #ThisControl.SignInfo}">
-              <ContentControl.Styles>
-                <Style Selector="ToolTip">
-                  <Setter Property="MaxWidth" Value="800"/>
-                </Style>
-              </ContentControl.Styles>
-
               <ContentControl.DataTemplates>
                 <DataTemplate DataType="m:CommitSignInfo">
                   <Border Width="24" Background="Transparent">
@@ -119,12 +113,6 @@
                            Margin="0,0,16,0"
                            PointerEntered="OnSHAPointerEntered"
                            PointerPressed="OnSHAPressed">
-                  <TextBlock.Styles>
-                    <Style Selector="ToolTip">
-                      <Setter Property="MaxWidth" Value="600"/>
-                    </Style>
-                  </TextBlock.Styles>
-
                   <TextBlock.DataTemplates>
                     <DataTemplate DataType="m:Commit">
                       <StackPanel MinWidth="400" Orientation="Vertical">
@@ -162,12 +150,6 @@
                            Margin="0,0,16,0"
                            PointerEntered="OnSHAPointerEntered"
                            PointerPressed="OnSHAPressed">
-                  <TextBlock.Styles>
-                    <Style Selector="ToolTip">
-                      <Setter Property="MaxWidth" Value="600"/>
-                    </Style>
-                  </TextBlock.Styles>
-
                   <TextBlock.DataTemplates>
                     <DataTemplate DataType="m:Commit">
                       <StackPanel MinWidth="400" Orientation="Vertical">
@@ -205,13 +187,7 @@
                                     Message="{Binding #ThisControl.Message}"
                                     IssueTrackerRules="{Binding #ThisControl.IssueTrackerRules}"
                                     HorizontalAlignment="Stretch"
-                                    TextWrapping="Wrap">
-            <v:CommitMessagePresenter.Styles>
-              <Style Selector="ToolTip">
-                <Setter Property="MaxWidth" Value="800"/>
-              </Style>
-            </v:CommitMessagePresenter.Styles>
-            
+                                    TextWrapping="Wrap">            
             <v:CommitMessagePresenter.DataTemplates>
               <DataTemplate DataType="m:Commit">
                 <StackPanel MinWidth="400" Orientation="Vertical">