diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java
index 26a2a583dd82..ab8e3ae08b98 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java
@@ -123,17 +123,21 @@ public class BreadcrumbsInitializingActivity implements StartupActivity, DumbAwa
       for (final FileEditor fileEditor : fileEditors) {
         if (fileEditor instanceof TextEditor) {
           Editor editor = ((TextEditor)fileEditor).getEditor();
-          if (BreadcrumbsXmlWrapper.getBreadcrumbsComponent(editor) != null) {
+          BreadcrumbsXmlWrapper wrapper = BreadcrumbsXmlWrapper.getBreadcrumbsComponent(editor);
+          if (wrapper != null) {
+            wrapper.queueUpdate();
             continue;
           }
-          final BreadcrumbsXmlWrapper wrapper = new BreadcrumbsXmlWrapper(editor);
+
+          wrapper = new BreadcrumbsXmlWrapper(editor);
           final JComponent c = wrapper.getComponent();
           fileEditorManager.addTopComponent(fileEditor, c);
 
+          BreadcrumbsXmlWrapper finalWrapper = wrapper;
           Disposer.register(fileEditor, new Disposable() {
             @Override
             public void dispose() {
-              disposeWrapper(fileEditorManager, fileEditor, wrapper);
+              disposeWrapper(fileEditorManager, fileEditor, finalWrapper);
             }
           });
         }
diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
index afcdf58a8367..6aa3bcdd7d3f 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
@@ -17,8 +17,6 @@ package com.intellij.xml.breadcrumbs;
 
 import com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingUtil;
 import com.intellij.codeInsight.highlighting.HighlightManager;
-import com.intellij.ide.ui.UISettings;
-import com.intellij.ide.ui.UISettingsListener;
 import com.intellij.lang.Language;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.Document;
@@ -101,7 +99,6 @@ public class BreadcrumbsXmlWrapper implements BreadcrumbsItemListener<Breadcrumb
     Document document = myEditor.getDocument();
     myFile = FileDocumentManager.getInstance().getFile(document);
 
-
     final FileStatusManager manager = FileStatusManager.getInstance(project);
     manager.addFileStatusListener(new FileStatusListener() {
       @Override
@@ -110,14 +107,6 @@ public class BreadcrumbsXmlWrapper implements BreadcrumbsItemListener<Breadcrumb
       }
     }, this);
 
-    project.getMessageBus().connect(this).subscribe(UISettingsListener.TOPIC, new UISettingsListener() {
-      @Override
-      public void uiSettingsChanged(UISettings uiSettings) {
-        queueUpdate();
-      }
-    });
-
-
     myInfoProvider = findInfoProvider(findViewProvider(myFile, myProject));
 
     final CaretListener caretListener = new CaretAdapter() {