diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
index 54973765f75a..8f7c7512b2c2 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
@@ -101,7 +101,9 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel, C
   }
 
   public boolean loadInitialCheckBoxState() {
-    return getPropertiesStorage().isTrueValue("GoToAction.allIncluded");
+    PropertiesComponent propertiesComponent = getPropertiesStorage();
+    return Boolean.TRUE.toString().equals(propertiesComponent.getValue("GoToAction.toSaveAllIncluded")) &&
+           propertiesComponent.isTrueValue("GoToAction.allIncluded");
   }
 
   private PropertiesComponent getPropertiesStorage() {
@@ -109,7 +111,10 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel, C
   }
 
   public void saveInitialCheckBoxState(boolean state) {
-    getPropertiesStorage().setValue("GoToAction.allIncluded", Boolean.toString(state));
+    PropertiesComponent propertiesComponent = getPropertiesStorage();
+    if (Boolean.TRUE.toString().equals(propertiesComponent.getValue("GoToAction.toSaveAllIncluded"))) {
+      propertiesComponent.setValue("GoToAction.allIncluded", Boolean.toString(state));
+    }
   }
 
   public ListCellRenderer getListCellRenderer() {