diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
index c8052d49762..e0d00dbb19a 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
@@ -80,6 +80,7 @@ public static void CopyDirectory(string directoryName, DirectoryNode node, bool
 			if (!FileUtility.IsEqualFileName(directoryName, copiedFileName)) {
 				if (includeInProject && ProjectService.OpenSolution != null) {
 					// get ProjectItems in source directory
+                    FileService.CopyFile(directoryName, copiedFileName, true, false);
 					foreach (IProject project in ProjectService.OpenSolution.Projects) {
 						if (!FileUtility.IsBaseDirectory(project.Directory, directoryName))
 							continue;
@@ -111,7 +112,6 @@ public static void CopyDirectory(string directoryName, DirectoryNode node, bool
 					}
 				}
 				
-				FileService.CopyFile(directoryName, copiedFileName, true, false);
 				DirectoryNode newNode = new DirectoryNode(copiedFileName);
 				newNode.InsertSorted(node);
 				if (includeInProject) {
@@ -365,6 +365,7 @@ protected IEnumerable<FileProjectItem> AddNewItems()
 			FileTemplateResult result = SD.UIService.ShowNewFileDialog(node.Project, node.Directory);
 			if (result != null) {
 				node.RecreateSubNodes();
+                ProjectBrowserPad.Instance.ProjectBrowserControl.SelectFile(result.Options.FileName);
 				return result.NewFiles.Select(node.Project.FindFile).Where(f => f != null).ToArray();
 			} else {
 				return null;