diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
index 73cf726a0b1e..414fca47790b 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
@@ -23,8 +23,13 @@ import org.jetbrains.annotations.Nullable;
  * @author Dmitry Avdeev
  *         Date: 10/9/12
  */
-@State(name = "SelectProjectTemplateSettings", storages = {@Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")})
+@State(
+  name = "SelectProjectTemplateSettings",
+  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/projectSelectTemplate.xml", roamingType = RoamingType.DISABLED)
+)
 public class SelectTemplateSettings implements PersistentStateComponent<SelectTemplateSettings> {
+  public boolean EXPERT_MODE = false;
+  public String LAST_TEMPLATE = null;
 
   public static SelectTemplateSettings getInstance() {
     return ServiceManager.getService(SelectTemplateSettings.class);
@@ -61,7 +66,4 @@ public class SelectTemplateSettings implements PersistentStateComponent<SelectTe
     EXPERT_MODE = state.EXPERT_MODE;
     LAST_TEMPLATE = state.LAST_TEMPLATE;
   }
-
-  public boolean EXPERT_MODE = false;
-  public String LAST_TEMPLATE = null;
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index e6f1e5dfa1cc..2c58438acba3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
@@ -47,7 +47,7 @@ import java.util.*;
   name = "TemplateSettings",
   storages = {
     @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml"),
-    @Storage(file = StoragePathMacros.APP_CONFIG + "/template.settings.xml")
+    @Storage(file = StoragePathMacros.APP_CONFIG + "/templates.xml")
   },
   storageChooser = LastStorageChooserForWrite.class
 )