diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 547495fc42..7d42727046 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -281,17 +281,7 @@
 		
 		<Condition name="WriteableProject" action="Disable">
 			<MenuItem id = "ProjectAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu" >
-				<MenuItem id    = "New Item"
-				          label = "${res:ProjectComponent.ContextMenu.NewItem}"
-				          icon  = "Icons.16x16.NewDocumentIcon"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
-				<MenuItem id    = "Existing Item"
-				          label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
-				<MenuItem id    = "NewFolder"
-				          label = "${res:ProjectComponent.ContextMenu.NewFolder}"
-				          icon  = "Icons.16x16.NewFolderIcon"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
+				<Include path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/FolderNode/Add"/>
 			</MenuItem>
 			
 			<MenuItem id    = "AddReference"
@@ -393,17 +383,7 @@
 			
 			<Condition name = "Ownerstate" ownerstate = "InProject">
 				<MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type="Menu">
-					<MenuItem id    = "New Item"
-					          label = "${res:ProjectComponent.ContextMenu.NewItem}"
-					          icon  = "Icons.16x16.NewDocumentIcon"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
-					<MenuItem id    = "Existing Item"
-					          label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
-					<MenuItem id    = "NewFolder"
-					          label = "${res:ProjectComponent.ContextMenu.NewFolder}"
-					          icon  = "Icons.16x16.NewFolderIcon"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
+					<Include path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/FolderNode/Add"/>
 					<MenuItem id    = "AddDependentSeparator"
 					          type  = "Separator" />
 					<MenuItem id    = "NewDependentItem"
@@ -559,6 +539,9 @@
 				          label = "${res:ProjectComponent.ContextMenu.NewFolder}"
 				          icon  = "Icons.16x16.NewFolderIcon"
 				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
+				<MenuItem id    = "ExistingFolder"
+				          label = "${res:ProjectComponent.ContextMenu.ExistingFolder}"
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingFolderToProject"/>
 			</MenuItem>
 			<MenuItem id = "AddSeparator" type = "Separator"  />
 			
@@ -943,7 +926,7 @@
 		</Condition>
 		
 		<ToolbarItem id = "ChooseConfigurationSeparator" type = "Separator"/>
-
+		
 		<ToolbarItem id    = "ChooseLayout"
 		             type  = "ComboBox"
 		             class = "ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand" />
@@ -1362,17 +1345,7 @@
 		<Condition name = "ProjectActive" activeproject="*">
 			<MenuItem id = "Project" label = "${res:XML.MainMenu.ProjectMenu}" type="Menu">
 				<MenuItem id = "ProjectAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu" >
-					<MenuItem id    = "New Item"
-					          label = "${res:ProjectComponent.ContextMenu.NewItem}"
-					          icon  = "Icons.16x16.NewDocumentIcon"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
-					<MenuItem id    = "Existing Item"
-					          label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
-					<MenuItem id    = "NewFolder"
-					          label = "${res:ProjectComponent.ContextMenu.NewFolder}"
-					          icon  = "Icons.16x16.NewFolderIcon"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
+					<Include path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/FolderNode/Add"/>
 				</MenuItem>
 				<MenuItem id    = "AddReference"
 				          label = "${res:ProjectComponent.ContextMenu.AddReference}"
@@ -1483,7 +1456,7 @@
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"/>
 				</Condition>
 			</Condition>
-
+			
 			<Condition name="DebuggerSupports" debuggersupports="Attaching">
 				<Condition name="IsProcessRunning" isprocessrunning="False" isdebugging="False" action="Disable">
 					<MenuItem id    = "Attach"
@@ -1491,7 +1464,7 @@
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.AttachToProcessCommand"/>
 				</Condition>
 			</Condition>
-	
+			
 			<Condition name="DebuggerSupports" debuggersupports="Detaching">
 				<Condition name="IsProcessRunning" isdebugging="True" action="Disable">
 					<MenuItem id    = "Detach"
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 f0a6bd28cc..5dee9ab9ef 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
@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 using System.Windows.Forms;
 
@@ -168,7 +169,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		{
 			TreeNode selectedNode = ProjectBrowserPad.Instance.ProjectBrowserControl.SelectedNode;
 			DirectoryNode node = selectedNode as DirectoryNode;
-			if (node == null) {
+			if (node == null && selectedNode != null) {
 				node = selectedNode.Parent as DirectoryNode;
 			}
 			if (node == null) {
@@ -212,11 +213,12 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 					
 					string copiedFileName = Path.Combine(node.Directory, Path.GetFileName(fileNames[0].Key));
 					if (!FileUtility.IsEqualFileName(fileNames[0].Key, copiedFileName)) {
-						int res = MessageService.ShowCustomDialog(fdiag.Title, "${res:ProjectComponent.ContextMenu.AddExistingFiles.Question}",
-						                                          0, 2,
-						                                          "${res:ProjectComponent.ContextMenu.AddExistingFiles.Copy}",
-						                                          "${res:ProjectComponent.ContextMenu.AddExistingFiles.Link}",
-						                                          "${res:Global.CancelButtonText}");
+						int res = MessageService.ShowCustomDialog(
+							fdiag.Title, "${res:ProjectComponent.ContextMenu.AddExistingFiles.Question}",
+							0, 2,
+							"${res:ProjectComponent.ContextMenu.AddExistingFiles.Copy}",
+							"${res:ProjectComponent.ContextMenu.AddExistingFiles.Link}",
+							"${res:Global.CancelButtonText}");
 						if (res == 1) {
 							// Link
 							foreach (KeyValuePair<string, string> pair in fileNames) {
@@ -271,6 +273,65 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		}
 	}
 	
+	public class AddExistingFolderToProject : AbstractMenuCommand
+	{
+		public override void Run()
+		{
+			TreeNode selectedNode = ProjectBrowserPad.Instance.ProjectBrowserControl.SelectedNode;
+			DirectoryNode node = selectedNode as DirectoryNode;
+			if (node == null && selectedNode != null) {
+				node = selectedNode.Parent as DirectoryNode;
+			}
+			if (node == null) {
+				return;
+			}
+			node.Expanding();
+			node.Expand();
+			
+			using (FolderBrowserDialog dlg = new FolderBrowserDialog()) {
+				dlg.SelectedPath = node.Directory;
+				dlg.ShowNewFolderButton = false;
+				if (dlg.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) {
+					string folderName = dlg.SelectedPath;
+					string copiedFolderName = Path.Combine(node.Directory, Path.GetFileName(folderName));
+					if (!FileUtility.IsEqualFileName(folderName, copiedFolderName)) {
+						if (FileUtility.IsBaseDirectory(folderName, node.Directory)) {
+							MessageService.ShowError("Cannot copy " + folderName + " to " + copiedFolderName);
+							return;
+						}
+						if (Directory.Exists(copiedFolderName)) {
+							MessageService.ShowError("Cannot copy " + folderName + " to " + copiedFolderName + ": target already exists.");
+							return;
+						}
+						int res = MessageService.ShowCustomDialog(
+							"${res:ProjectComponent.ContextMenu.ExistingFolder}",
+							"${res:ProjectComponent.ContextMenu.ExistingFolder.CopyQuestion}",
+							0, 1,
+							"${res:ProjectComponent.ContextMenu.AddExistingFiles.Copy}",
+							"${res:Global.CancelButtonText}");
+						if (res != 0)
+							return;
+						if (!FileService.CopyFile(folderName, copiedFolderName, true, false))
+							return;
+					}
+					// ugly HACK to get IncludeDirectoryNode to work properly
+					AbstractProjectBrowserTreeNode.ShowAll = true;
+					try {
+						node.RecreateSubNodes();
+						DirectoryNode newNode = node.AllNodes.OfType<DirectoryNode>()
+							.FirstOrDefault(dir=>FileUtility.IsEqualFileName(copiedFolderName, dir.Directory));
+						if (newNode != null) {
+							newNode.Expanding();
+							IncludeFileInProject.IncludeDirectoryNode(newNode, true);
+						}
+					} finally {
+						AbstractProjectBrowserTreeNode.ShowAll = false;
+					}
+					node.RecreateSubNodes();
+				}
+			}
+		}
+	}
 	
 	/// <summary>
 	/// Menu item that display the NewFileDialog dialog and adds it to the solution.
@@ -291,7 +352,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 			DirectoryNode node = ProjectBrowserPad.Instance.ProjectBrowserControl.SelectedDirectoryNode;
 			if (node == null) {
 				return null;
-			}	
+			}
 			node.Expand();
 			node.Expanding();