diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsWatcher.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsWatcher.java
index d10f83b501c2..7eae69b096fa 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsWatcher.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsWatcher.java
@@ -88,6 +88,10 @@ public class VcsLogTabsWatcher implements Disposable {
 
   @Override
   public void dispose() {
+    removeListeners();
+  }
+
+  private void removeListeners() {
     myToolWindowManager.removeToolWindowManagerListener(myPostponedEventsListener);
 
     if (myToolWindow != null) {
@@ -172,7 +176,10 @@ public class VcsLogTabsWatcher implements Disposable {
 
     @Override
     public void stateChanged() {
-      if (myToolWindow != null && myIsVisible != myToolWindow.isVisible()) {
+      if (myToolWindow == null) return;
+      if (myToolWindowManager.getToolWindow(TOOLWINDOW_ID) == null) {
+        removeListeners();
+      } else if (myIsVisible != myToolWindow.isVisible()) {
         myIsVisible = myToolWindow.isVisible();
         selectionChanged();
       }
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
index 4518e65f2969..dfe7fd34da2c 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
@@ -254,9 +254,9 @@ public class CommitPanel extends JBPanel {
       String subject = separator > 0 ? fullMessage.substring(0, separator) : fullMessage;
       String description = fullMessage.substring(subject.length());
       return "<b>" +
-             getHtmlWithFonts(escapeMultipleSpaces(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, subject)), Font.BOLD) +
+             escapeMultipleSpaces(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, subject)) +
              "</b>" +
-             getHtmlWithFonts(escapeMultipleSpaces(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, description)));
+             escapeMultipleSpaces(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, description));
     }
 
     @NotNull