diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
index a660037d7346..6ba150185b14 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -436,8 +436,9 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
     myContextObject = null;
 
     myUpdateQueue.cancelAllUpdates();
-
-    myUpdateQueue.queueModelUpdateForObject(obj);
+    if (myNodePopup != null && myNodePopup.isVisible()) {
+      myUpdateQueue.queueModelUpdateForObject(obj);
+    }
     myUpdateQueue.queueRebuildUi();
 
     myUpdateQueue.queueAfterAll(new Runnable() {