diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
index df267c7e5c12..7583df35303a 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
@@ -137,10 +137,10 @@ public class BreadcrumbsLoaderComponent extends AbstractProjectComponent {
 
   private static void removeBreadcrumbs(@NotNull FileEditorManager fileEditorManager, @NotNull VirtualFile file) {
     final FileEditor[] fileEditors = fileEditorManager.getAllEditors(file);
-    for (final FileEditor fileEditor : fileEditors) {
+    for (FileEditor fileEditor : fileEditors) {
       if (fileEditor instanceof TextEditor) {
         Editor editor = ((TextEditor)fileEditor).getEditor();
-        final BreadcrumbsXmlWrapper wrapper = BreadcrumbsXmlWrapper.getBreadcrumbsComponent(editor);
+        BreadcrumbsXmlWrapper wrapper = BreadcrumbsXmlWrapper.getBreadcrumbsComponent(editor);
         if (wrapper != null) {
           disposeWrapper(fileEditorManager, fileEditor, wrapper);
         }
diff --git a/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java
index b8b7904305bc..438c438d2b1f 100644
--- a/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java
+++ b/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java
@@ -60,8 +60,11 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
   }
 
   public void setBreadcrumbsEnabled(boolean b) {
+    boolean oldValue = myBreadcrumbsEnabled;
     myBreadcrumbsEnabled = b;
-    ApplicationManager.getApplication().getMessageBus().syncPublisher(WEB_EDITOR_OPTIONS).breadcrumbsOptionsChanged(this);
+    if (oldValue != b) {
+      ApplicationManager.getApplication().getMessageBus().syncPublisher(WEB_EDITOR_OPTIONS).breadcrumbsOptionsChanged(this);
+    }
   }
 
   public boolean isBreadcrumbsEnabledInXml() {
@@ -69,8 +72,11 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
   }
 
   public void setBreadcrumbsEnabledInXml(boolean b) {
+    boolean oldValue = myBreadcrumbsEnabledInXml;
     myBreadcrumbsEnabledInXml = b;
-    ApplicationManager.getApplication().getMessageBus().syncPublisher(WEB_EDITOR_OPTIONS).breadcrumbsOptionsChanged(this);
+    if (oldValue != b) {
+      ApplicationManager.getApplication().getMessageBus().syncPublisher(WEB_EDITOR_OPTIONS).breadcrumbsOptionsChanged(this);
+    }
   }
 
   public boolean isShowCssInlineColorPreview() {