diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ImageSourceEditor/ChooseImageDialog.xaml.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ImageSourceEditor/ChooseImageDialog.xaml.cs
index 719d5a110d..f40eff47cf 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ImageSourceEditor/ChooseImageDialog.xaml.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ImageSourceEditor/ChooseImageDialog.xaml.cs
@@ -38,10 +38,10 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 		private static string[] Extension;
 		
 		private PropertyNode _node;
-		private List<ImageData> _data;		
+		private List<ImageData> _data;
 		
 		static ChooseImageDialog()
-		{			
+		{
 			Extension = new String[]{".jpg", ".bmp", ".png", ".gif", ".ico", ".dib", ".jpe", ".jpeg", ".tif", ".tiff"};
 		}
 		
@@ -71,6 +71,7 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 			}
 			
 			Display.ItemsSource=_data;
+			Display.SelectionChanged+=delegate { Display.SelectedItem=null; };
 		}
 		
 		#region Event Handlers
@@ -91,8 +92,10 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 				List<string> temp=new List<string>();
 				foreach(var file in fileNames){
 					temp.Add(Path.GetFileName(file));
-					}
-				 _data.OrderBy(image => image.Header).ElementAt(0).Images.AddRange(fileNames);
+				}
+				if(fileNames.Length!=0)
+					txURL.Text = fileNames.Last();
+				_data.OrderBy(image => image.Header).ElementAt(0).Images.AddRange(fileNames);
 			}
 		}
 		
@@ -121,7 +124,7 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 				_node.Value=_imgDisplay.SelectedItem;
 				Close();
 			}
-				
+			
 		}
 		
 		protected override void OnPreviewKeyUp(KeyEventArgs e)
@@ -144,7 +147,7 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 					else
 						MessageBox.Show(this, "The specified file is not a valid image file", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
 					
-					Close();				
+					Close();
 				}
 				else{
 					MessageBox.Show(this, "The specified file does not exist on the disk", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -156,13 +159,7 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 		{
 			Close();
 		}
-		
-		void DisplaySelectionChanged(object sender, SelectionChangedEventArgs e)
-		{
-			Display.SelectedItem=null;
-		}
-		
-		#endregion	
+		#endregion
 	}
 	
 	public class ImageData
@@ -181,6 +178,6 @@ namespace ICSharpCode.WpfDesign.AddIn.ImageSourceEditor
 		{
 			this.Header=header;
 			this.Images=images;
-		}		
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs
index c934a23d8a..2773e591ff 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs
@@ -17,28 +17,26 @@ namespace ICSharpCode.WpfDesign.AddIn
 	/// <summary>
 	/// Static helper methods to interact with the project
 	/// </summary>
-	public class ProjectTools
+	internal class ProjectTools
 	{
 		/// <summary>
 		/// Add files to the current project at the project node.
 		/// </summary>
-		/// <param name="fileNames"></param>
+		/// <param name="fileNames">list of files that have to be added.</param>
 		internal static void AddFiles(string []fileNames)
 		{
-			IProject project=ProjectService.CurrentProject;			
-			ProjectNode projectNode=ProjectBrowserPad.Instance.CurrentProject;
-			Debug.Assert(project!=null);
-			Debug.Assert(projectNode!=null);
+			IProject project=ProjectService.CurrentProject;	
+			Debug.Assert(project!=null);				
 			
 			foreach(var file in fileNames){
 				string relFileName=FileUtility.GetRelativePath(project.Directory,file);
 				FileProjectItem fileProjectItem=new FileProjectItem(project,project.GetDefaultItemType(file),relFileName);
 				FileNode fileNode=new FileNode(file,FileNodeStatus.InProject);
-				fileNode.ProjectItem=fileProjectItem;
-				fileNode.InsertSorted(projectNode);
+				fileNode.ProjectItem=fileProjectItem;				
 				ProjectService.AddProjectItem(project,fileProjectItem);
 			}
 			project.Save();
+			ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView();
 		}
 		
 		/// <summary>