diff --git a/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java b/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java
--- a/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java
+++ b/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java
@@ -260,6 +260,8 @@
 
     private class TooltipContentPanel extends JComponent {
 
+        private int authorLinkerId=0;
+        private int commitMessageLinkerId=1;
         public TooltipContentPanel(JTextComponent parentPane) {
             try {
                 textPane = new JTextPane();
@@ -281,7 +283,7 @@
 
                 // author
                 String author = annotateLine.getAuthor().toString();
-                StyledDocumentHyperlink l = linkerSupport.getLinker(AuthorLinker.class, 0);
+                StyledDocumentHyperlink l = linkerSupport.getLinker(AuthorLinker.class, authorLinkerId);
                 if(master.isKenai()) {
                     KenaiUser kenaiUser = master.getKenaiUser(author);
                     if(kenaiUser != null) {
@@ -293,7 +295,7 @@
                                 KenaiUser.getChatLink(
                                     master.getCurrentFileObject(),
                                     annotateLine.getLineNum()));
-                        linkerSupport.add(l, 0);
+                        linkerSupport.add(l, authorLinkerId);
                     }
                 }
                 if(l != null) {
@@ -310,15 +312,16 @@
                 // commit msg
                 String commitMessage = annotateLine.getRevisionInfo().getFullMessage();
                 List<VCSHyperlinkProvider> providers = Git.getInstance().getHyperlinkProviders();
+                IssueLinker issueLinker = null;
                 for (VCSHyperlinkProvider hp : providers) {
-                    l = IssueLinker.create(hp, hyperlinkStyle, master.getRepositoryRoot(), doc, commitMessage);
-                    if (l != null) {
-                        linkerSupport.add(l, 0);
+                    issueLinker = IssueLinker.create(hp, hyperlinkStyle, master.getRepositoryRoot(), doc, commitMessage);
+                    if (issueLinker != null) {
+                        linkerSupport.add(issueLinker, commitMessageLinkerId);
                         break;
                     }
                 }
-                if(l != null) {
-                    l.insertString(doc, normalStyle);
+                if (issueLinker != null) {
+                    issueLinker.insertString(doc, normalStyle);
                 } else {
                     doc.insertString(doc.getLength(), commitMessage, normalStyle);
                 }