diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java
index fe50d4775684..6c9a5adc83c4 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java
@@ -69,7 +69,7 @@ public abstract class CreateFromTemplateActionBase extends AnAction {
         PsiElement createdElement = dialog.create();
         if (createdElement != null) {
           elementCreated(dialog, createdElement);
-          view.selectElement(createdElement);
+          selectElement(createdElement, dir, view);
           if (selectedTemplate.isLiveTemplateEnabled() && createdElement instanceof PsiFile) {
             Map<String, String> defaultValues = getLiveTemplateDefaults(dataContext, ((PsiFile)createdElement));
             startLiveTemplate((PsiFile)createdElement, notNull(defaultValues, Collections.emptyMap()));
@@ -128,6 +128,10 @@ public abstract class CreateFromTemplateActionBase extends AnAction {
 
   protected void elementCreated(CreateFromTemplateDialog dialog, PsiElement createdElement) { }
 
+  protected void selectElement(@NotNull PsiElement element, @NotNull PsiDirectory directory, @NotNull IdeView view) {
+    view.selectElement(element);
+  }
+
   @Nullable
   protected Map<String, String> getLiveTemplateDefaults(DataContext dataContext, @NotNull PsiFile file) {
     return null;