diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 1624d79aae9e..3769f684845e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -382,6 +382,12 @@ public void addMessageToConsoleWindow(final String message, final TextAttributes
     final String displayName = VcsBundle.message("vcs.console.toolwindow.display.name");
     Content content = contentManager.findContent(displayName);
     if (content == null) {
+      if (myEditorAdapter != null) {
+        final Editor editor = myEditorAdapter.getEditor();
+        if (! editor.isDisposed()) {
+          EditorFactory.getInstance().releaseEditor(editor);
+        }
+      }
       final EditorFactory editorFactory = EditorFactory.getInstance();
       final Editor editor = editorFactory.createViewer(editorFactory.createDocument(""), myProject);
       EditorSettings editorSettings = editor.getSettings();