diff --git a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
index c7d756a39ca5..c35f4f6723fb 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
@@ -18,7 +18,6 @@ package com.intellij.usages.impl;
 
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.colors.EditorColors;
@@ -108,7 +107,8 @@ public class UsagePreviewPanel extends UsageContextPanelBase {
       myEditor.setBorder(null);
       add(myEditor.getComponent(), BorderLayout.CENTER);
 
-      revalidate();
+      invalidate();
+      validate();
     }
 
     highlight(infos, myEditor, myProject, true, HighlighterLayer.ADDITIONAL_SYNTAX);
@@ -126,22 +126,6 @@ public class UsagePreviewPanel extends UsageContextPanelBase {
                                @NotNull final Project project,
                                boolean highlightOnlyNameElements,
                                int highlightLayer) {
-    ApplicationManager.getApplication().invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        if (project.isDisposed()) return;
-        if (!editor.isDisposed()) {
-          doHighlight(infos, editor, project, highlightOnlyNameElements, highlightLayer);
-        }
-      }
-    }, ModalityState.current());
-  }
-
-  private static void doHighlight(@NotNull List<UsageInfo> infos,
-                                  @NotNull Editor editor,
-                                  @NotNull Project project,
-                                  boolean highlightOnlyNameElements,
-                                  int highlightLayer) {
     PsiDocumentManager.getInstance(project).commitAllDocuments();
 
     MarkupModel markupModel = editor.getMarkupModel();