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 a76d9f9447..d6b444bb71 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
@@ -33,7 +33,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 			if (dockLayout == null)
 				throw new ArgumentNullException("dockLayout");
 			
-			FocusManager.SetIsFocusScope(this, true);
 			this.IsFloatingAllowed = true;
 			this.dockLayout = dockLayout;
 			viewContents = new ViewContentCollection(this);
@@ -423,13 +422,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		protected override void FocusContent()
-		{
-			LoggingService.Debug("Trying to set focus to: " + FocusManager.GetFocusedElement(this));
-			Keyboard.Focus(FocusManager.GetFocusedElement(this));
-			LoggingService.Debug("Focus was set to: " + Keyboard.FocusedElement);
-		}
-		
 		public override string ToString()
 		{
 			return "[AvalonWorkbenchWindow: " + this.Title + "]";
diff --git a/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs b/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs
index e3db45a8ee..334428e0c4 100644
--- a/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs
+++ b/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs
@@ -59,6 +59,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		#endregion
 		
+		public override string ToString()
+		{
+			if (ServiceObject != null)
+				return "[SDWindowsFormsHost " + Child + " for " + ServiceObject + "]";
+			else
+				return "[SDWindowsFormsHost " + Child + "]";
+		}
+		
 		#region Service Object
 		/// <summary>
 		/// Gets/Sets the object that implements the IClipboardHandler, IUndoHandler etc. interfaces...