diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/SingleInspectionProfilePanelTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/SingleInspectionProfilePanelTest.java
new file mode 100644
index 000000000000..9a45fd5817a2
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/SingleInspectionProfilePanelTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2000-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInspection;
+
+import com.intellij.codeInspection.ex.InspectionProfileImpl;
+import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
+import com.intellij.codeInspection.javaDoc.JavaDocLocalInspection;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
+import com.intellij.profile.codeInspection.ui.SingleInspectionProfilePanel;
+import com.intellij.testFramework.LightIdeaTestCase;
+
+/**
+ * @author Dmitry Avdeev
+ *         Date: 5/10/12
+ */
+public class SingleInspectionProfilePanelTest extends LightIdeaTestCase {
+
+  // see IDEA-85700
+  public void testSettingsModification() throws Exception {
+
+    Project project = ProjectManager.getInstance().getDefaultProject();
+    InspectionProjectProfileManager profileManager = InspectionProjectProfileManager.getInstance(project);
+    InspectionProfileImpl profile = (InspectionProfileImpl)profileManager.getProfile(PROFILE);
+    profile.initInspectionTools(project);
+
+    InspectionProfileImpl model = (InspectionProfileImpl)profile.getModifiableModel();
+    SingleInspectionProfilePanel panel = new SingleInspectionProfilePanel(profileManager, PROFILE, model);
+    panel.setVisible(true);
+    panel.reset();
+
+    LocalInspectionToolWrapper wrapper = (LocalInspectionToolWrapper)model.getInspectionTool(myInspection.getShortName());
+    assert wrapper != null;
+    JavaDocLocalInspection tool = (JavaDocLocalInspection)wrapper.getTool();
+    assertEquals("", tool.myAdditionalJavadocTags);
+    tool.myAdditionalJavadocTags = "foo";
+    model.setModified(true);
+    panel.apply();
+
+
+    wrapper = (LocalInspectionToolWrapper)profile.getInspectionTool(myInspection.getShortName());
+    assert wrapper != null;
+    tool = (JavaDocLocalInspection)wrapper.getTool();
+    assertEquals("foo", tool.myAdditionalJavadocTags);
+  }
+
+  @Override
+  public void setUp() throws Exception {
+    InspectionProfileImpl.INIT_INSPECTIONS = true;
+    super.setUp();
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    InspectionProfileImpl.INIT_INSPECTIONS = false;
+    super.tearDown();
+  }
+
+  private final JavaDocLocalInspection myInspection = new JavaDocLocalInspection();
+
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[] {myInspection};
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
index c49b1ecbc643..39efab431bb4 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
@@ -842,6 +842,7 @@ public class SingleInspectionProfilePanel extends JPanel {
   }
 
   private void setSelectedProfile(final ModifiableModel modifiableModel) {
+    if (mySelectedProfile == modifiableModel) return;
     mySelectedProfile = (InspectionProfileImpl)modifiableModel;
     if (mySelectedProfile != null) {
       myInitialProfile = mySelectedProfile.getName();
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 2078af288a71..b3df4e20de88 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -343,7 +343,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
       enableInspectionTool(availableInspectionTools, new LocalInspectionToolWrapper(tool));
     }
 
-    final InspectionProfileImpl profile = new InspectionProfileImpl("Configurable") {
+    final InspectionProfileImpl profile = new InspectionProfileImpl(PROFILE) {
       @Override
       @NotNull
       public InspectionProfileEntry[] getInspectionTools(PsiElement element) {