diff --git a/src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs
index ac22676014..2e1b7a4d62 100644
--- a/src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs
@@ -78,36 +78,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void RedrawContent();
 		
-		/// <summary>
-		/// Used internally:
-		/// This method is called by the workbench to notify the window that is was selected.
-		/// </summary>
-		void OnWindowSelected(EventArgs e);
-		
-		/// <summary>
-		/// Used internally:
-		/// This method is called by the workbench to notify the window that is was deselected.
-		/// </summary>
-		void OnWindowDeselected(EventArgs e);
-		
-		/// <summary>
-		/// Is called when the window is selected.
-		/// </summary>
-		event EventHandler WindowSelected;
-		
-		/// <summary>
-		/// Is called when the window is deselected.
-		/// </summary>
-		event EventHandler WindowDeselected;
-		
 		/// <summary>
 		/// Is called when the title of this window has changed.
 		/// </summary>
 		event EventHandler TitleChanged;
-		
-		/// <summary>
-		/// Is called after the window closes.
-		/// </summary>
-		event EventHandler CloseEvent;
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
index baf187e4ce..aa0b75af54 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
@@ -278,6 +278,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				
 				if (newTitle != Title) {
 					Title = newTitle;
+					OnTitleChanged(EventArgs.Empty);
 				}
 			}
 		}
@@ -339,7 +340,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 
-			OnCloseEvent(null);
 			Dispose();
 			return true;
 		}
@@ -366,38 +366,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-//		protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
-//		{
-//			e.Cancel = !CloseWindow(false);
-//		}
-		
-		void OnCloseEvent(EventArgs e)
-		{
-			OnWindowDeselected(e);
-			if (CloseEvent != null) {
-				CloseEvent(this, e);
-			}
-		}
-		
-		public void OnWindowSelected(EventArgs e)
-		{
-			if (WindowSelected != null) {
-				WindowSelected(this, e);
-			}
-		}
-		
-		public void OnWindowDeselected(EventArgs e)
-		{
-			if (WindowDeselected != null) {
-				WindowDeselected(this, e);
-			}
-		}
-		
-		public event EventHandler WindowSelected;
-		public event EventHandler WindowDeselected;
-		
 		public event EventHandler TitleChanged;
-		public event EventHandler CloseEvent;
 		
 		public BitmapSource Icon { get; set; }
 	}