diff --git a/java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
index 423118294fc3..463509a7bcbe 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
@@ -66,8 +66,7 @@ public abstract class CreateTemplateInPackageAction<T extends PsiElement> extend
       }
     });
     if (createdElement != null) {
-      final PsiElement navigationElement = getNavigationElement(createdElement);
-      view.selectElement(navigationElement == null ? createdElement : navigationElement);
+      view.selectElement(createdElement);
     }
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index feec037c4e16..ab5586a11604 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -1194,16 +1194,22 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
 
   private final class MyIdeView implements IdeView {
     public void selectElement(PsiElement element) {
-      selectPsiElement(element, true);
+      selectPsiElement(element, false);
+      boolean requestFocus = true;
       if (element != null) {
         final boolean isDirectory = element instanceof PsiDirectory;
         if (!isDirectory) {
           Editor editor = EditorHelper.openInEditor(element);
           if (editor != null) {
             ToolWindowManager.getInstance(myProject).activateEditorComponent();
+            requestFocus = false;
           }
         }
       }
+
+      if (requestFocus) {
+        selectPsiElement(element, true);
+      }
     }
 
     public PsiDirectory[] getDirectories() {