diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs
index d953aca789..915eec2f88 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs
@@ -202,7 +202,12 @@ namespace ICSharpCode.AvalonEdit.Gui
 		{
 			TextArea textArea = GetTextArea(target);
 			if (textArea != null && textArea.Document != null) {
-				CopySelectedText(textArea);
+				if (textArea.Selection.IsEmpty && textArea.Options.CutCopyWholeLine) {
+					DocumentLine currentLine = textArea.Document.GetLineByNumber(textArea.Caret.Line);
+					CopyWholeLine(textArea, currentLine);
+				} else {
+					CopySelectedText(textArea);
+				}
 				args.Handled = true;
 			}
 		}
diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs
index 645e0dd0e8..1f5cae305d 100644
--- a/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs
+++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs
@@ -164,7 +164,7 @@ namespace ICSharpCode.SharpDevelop.Editor
 				contextList.activationKey = charTyped;
 				foreach (CodeCompletionItem item in contextList.Items.OfType<CodeCompletionItem>()) {
 					IClass itemClass = item.Entity as IClass;
-					if (c != null && c.FullyQualifiedName == itemClass.FullyQualifiedName && c.TypeParameters.Count == itemClass.TypeParameters.Count) {
+					if (itemClass != null && c.FullyQualifiedName == itemClass.FullyQualifiedName && c.TypeParameters.Count == itemClass.TypeParameters.Count) {
 						contextList.SuggestedItem = item;
 						break;
 					}
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs b/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
index e5ef0d0e63..e236251317 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
@@ -63,10 +63,15 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public WpfWorkbench()
 		{
 			this.SynchronizingObject = new WpfSynchronizeInvoke(this.Dispatcher);
-			this.MainWin32Window = this.GetWin32Window();
 			InitializeComponent();
 		}
 		
+		protected override void OnSourceInitialized(EventArgs e)
+		{
+			this.MainWin32Window = this.GetWin32Window();
+			base.OnSourceInitialized(e);
+		}
+		
 		public void Initialize()
 		{
 			foreach (PadDescriptor content in AddInTree.BuildItems<PadDescriptor>(viewContentPath, this, false)) {