diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 18517d8d..5c81cf57 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -26,7 +26,7 @@
             return new Models.CommitSignInfo()
             {
                 VerifyResult = lines[0][0],
-                Signer = string.IsNullOrEmpty(lines[1]) ? "<UnKnown>" : lines[1],
+                Signer = lines[1],
                 Key = lines[2]
             };
 
diff --git a/src/Models/CommitSignInfo.cs b/src/Models/CommitSignInfo.cs
index ab2bfbf4..c6c30797 100644
--- a/src/Models/CommitSignInfo.cs
+++ b/src/Models/CommitSignInfo.cs
@@ -37,19 +37,19 @@ namespace SourceGit.Models
                 switch (VerifyResult)
                 {
                     case 'G':
-                        return $"Good signature.\n\nSigner: {Signer}\n\nKey: {Key}";
-                    case 'B':
-                        return $"Bad signature.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Good signature.";
                     case 'U':
-                        return $"Good signature with unknown validity.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Good signature with unknown validity.";
                     case 'X':
-                        return $"Good signature but has expired.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Good signature but has expired.";
                     case 'Y':
-                        return $"Good signature made by expired key.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Good signature made by expired key.";
                     case 'R':
-                        return $"Good signature made by a revoked key.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Good signature made by a revoked key.";
+                    case 'B':
+                        return "Bad signature.";
                     case 'E':
-                        return $"Signature cannot be checked.\n\nSigner: {Signer}\n\nKey: {Key}";
+                        return "Signature cannot be checked.";
                     default:
                         return "No signature.";
                 }
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 806abe65..fd9969ac 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -81,7 +81,20 @@
 
               <ContentControl.DataTemplates>
                 <DataTemplate DataType="m:CommitSignInfo">
-                  <Border Width="24" Background="Transparent" ToolTip.Tip="{Binding ToolTip}">
+                  <Border Width="24" Background="Transparent">
+                    <ToolTip.Tip>
+                      <StackPanel Orientation="Vertical">
+                        <TextBlock Margin="0,0,0,12" Text="{Binding ToolTip}"/>
+                        <TextBlock Margin="0,0,0,2" IsVisible="{Binding Signer, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                          <Run Text="Signer:"/>
+                          <Run Text="{Binding Signer}"/>
+                        </TextBlock>
+                        <TextBlock>
+                          <Run Text="KEY:"/>
+                          <Run Text="{Binding Key}"/>
+                        </TextBlock>
+                      </StackPanel>
+                    </ToolTip.Tip>
                     <Path Width="14" Height="14" Data="{StaticResource Icons.Verified}" Fill="{Binding Brush}"/>
                   </Border>
                 </DataTemplate>