diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
index 3e93f02fc39f..f710f886c65f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
@@ -634,9 +634,10 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
 
   private void disposeHighlighter() {
     if (myHighlighter != null) {
-      myHighlighter.uninstall();
-      HintManager.getInstance().hideAllHints();
+      HighlightersSet highlighter = myHighlighter;
       myHighlighter = null;
+      highlighter.uninstall();
+      HintManager.getInstance().hideAllHints();
     }
   }