diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index e9c60bb92039..88b7b7841c0e 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -320,13 +320,11 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       // rear document content will be cleared on next flush;
       myContentSize = 0;
       myBuffer.clear();
+      myHyperlinks.clearHyperlinks();
     }
     myFlushAlarm.cancelAllRequests();
     myFlushAlarm.addRequest(myClearRequest, 0, getStateForUpdate());
-    if (myHeavyAlarm != null) {
-      myHeavyAlarm.cancelAllRequests();
-      ++ myHeavyUpdateTicket;
-    }
+    cancelHeavyAlarm();
   }
 
   public void scrollTo(final int offset) {
@@ -410,7 +408,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       myEditor = createEditor();
       myEditor.getScrollPane().setBorder(null);
       myHyperlinks = new EditorHyperlinkSupport(myEditor, myProject);
-      requestFlushImmediately();
+      //requestFlushImmediately();
       myMainPanel.add(createCenterComponent(), BorderLayout.CENTER);
       myEditor.getScrollingModel().addVisibleAreaListener(new VisibleAreaListener() {
         @Override
@@ -500,7 +498,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
   }
 
   private ModalityState getStateForUpdate() {
-    return myStateForUpdate != null ? myStateForUpdate.compute() : ModalityState.stateForComponent(this);
+    return null;//myStateForUpdate != null ? myStateForUpdate.compute() : ModalityState.stateForComponent(this);
   }
 
   private void requestFlushImmediately() {
@@ -529,6 +527,10 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
     if (myProject.isDisposed()) {
       return;
     }
+    if (myEditor == null) {
+      //already disposed
+      return;
+    }
     if (clear) {
       final Document document;
       synchronized (LOCK) {
@@ -564,6 +566,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       }
       deferredTokensSize = deferredTokens.size();
       myBuffer.clear(false);
+      cancelHeavyAlarm();
     }
     final Document document = myEditor.getDocument();
     final int oldLineCount = document.getLineCount();
@@ -620,6 +623,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
           it.remove();
         }
       }
+      cancelHeavyAlarm();
       highlightHyperlinksAndFoldings(newLineCount >= lineCount + 1 ? newLineCount - lineCount - 1 : 0, newLineCount - 1);
     }
     else if (oldLineCount < newLineCount) {
@@ -631,6 +635,13 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
     }
   }
 
+  private void cancelHeavyAlarm() {
+    if (myHeavyAlarm != null) {
+      myHeavyAlarm.cancelAllRequests();
+      ++myHeavyUpdateTicket;
+    }
+  }
+
   private void flushDeferredUserInput() {
     final String textToSend = myBuffer.cutFirstUserInputLine();
     if (textToSend == null) {
@@ -853,20 +864,14 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
         myPredefinedMessageFilter.applyHeavyFilter(documentCopy, startOffset, startLine, new Consumer<FilterMixin.AdditionalHighlight>() {
           @Override
           public void consume(final FilterMixin.AdditionalHighlight additionalHighlight) {
-            SwingUtilities.invokeLater(
-              new Runnable() {
-                @Override
-                public void run() {
-                  if (myFlushAlarm.isDisposed()) return;
-                  myFlushAlarm.addRequest(new Runnable() {
-                    @Override
-                    public void run() {
-                      if (myHeavyUpdateTicket != currentValue) return;
-                      myHyperlinks.adjustHighlighters(Collections.singletonList(additionalHighlight));
-                    }
-                  }, 0);
-                }
-              });
+            if (myFlushAlarm.isDisposed()) return;
+            myFlushAlarm.addRequest(new Runnable() {
+              @Override
+              public void run() {
+                if (myHeavyUpdateTicket != currentValue) return;
+                myHyperlinks.adjustHighlighters(Collections.singletonList(additionalHighlight));
+              }
+            }, 0, getStateForUpdate());
           }
         });
         if (myHeavyAlarm.getActiveRequestCount() == 0) {
@@ -992,7 +997,6 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
     public void update(AnActionEvent e) {
       final boolean enabled = e.getData(LangDataKeys.CONSOLE_VIEW) != null;
       e.getPresentation().setEnabled(enabled);
-      e.getPresentation().setVisible(enabled);
     }
 
     public void actionPerformed(final AnActionEvent e) {