diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeCompletionTests.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeCompletionTests.cs
index 0bccd30034..68eae4c6ff 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeCompletionTests.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeCompletionTests.cs
@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
@@ -507,7 +508,7 @@ namespace ICSharpCode.XamlBinding.Tests
 	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
 	<Grid>
 		<Button AllowDrop='True' Grid.Row='0' Content='test ";
-		string fileFooter = @"' />
+			string fileFooter = @"' />
 	</Grid>
 </Window>";
 			
@@ -677,16 +678,16 @@ namespace ICSharpCode.XamlBinding.Tests
 	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
 	<Grid>
 		<Button AllowDrop='True' Grid.Row='0' Content='test ";
-		string fileFooter = @"' />
+			string fileFooter = @"' />
 	</Grid>
 </Window>";
 			
 			TestKeyPress(fileHeader, fileFooter, 'a', CodeCompletionKeyPressResult.None,
-			              list => {
-			              	Assert.AreEqual(0, list.PreselectionLength);
-			              	Assert.IsNull(list.SuggestedItem);
-			              	Assert.IsTrue(!list.Items.Any());
-			              });
+			             list => {
+			             	Assert.AreEqual(0, list.PreselectionLength);
+			             	Assert.IsNull(list.SuggestedItem);
+			             	Assert.IsTrue(!list.Items.Any());
+			             });
 		}
 		
 		[Test]
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeInsertionTests.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeInsertionTests.cs
new file mode 100644
index 0000000000..64fcbe9fc5
--- /dev/null
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CodeInsertionTests.cs
@@ -0,0 +1,92 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Siegfried Pammer" email="sie_pam@gmx.at"/>
+//     <version>$Revision: 5529 $</version>
+// </file>
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
+using NUnit.Framework;
+
+namespace ICSharpCode.XamlBinding.Tests
+{
+	[TestFixture]
+	[RequiresSTA]
+	public class CodeInsertionTests : TextEditorBasedTests
+	{
+		#region TextInsertionTests		
+		[Test]
+		public void CtrlSpaceClosingAttributeValueWithEqualsInsertionTest()
+		{
+			string fileHeader = @"<Window x:Class='ICSharpCode.XamlBinding.Tests.CompletionTestsBase'
+	xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+	<Grid>
+		<Button ";
+			string fileFooter = @"
+	</Grid>
+	</Window>";
+			
+			TestCtrlSpace(fileHeader, fileFooter, true,
+			              list => {
+			              	Assert.AreEqual(0, list.PreselectionLength);
+			              	Assert.IsNull(list.SuggestedItem);
+			              	Assert.IsTrue(list.Items.Any());
+			              	
+			              	TestTextInsert(fileHeader, fileFooter, '=', list, list.Items.First(i => i.Text == "Content"), "Content=\"\"", "Content=\"".Length);
+			              });
+		}	
+		
+		[Test]
+		public void CtrlSpaceInsertionTest()
+		{
+			string fileHeader = @"<Window x:Class='ICSharpCode.XamlBinding.Tests.CompletionTestsBase'
+	xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+	<Grid>
+		";
+			string fileFooter = @"
+	</Grid>
+	</Window>";
+			
+			TestCtrlSpace(fileHeader, fileFooter, true,
+			              list => {
+			              	Assert.AreEqual(0, list.PreselectionLength);
+			              	Assert.IsNull(list.SuggestedItem);
+			              	Assert.IsTrue(list.Items.Any());
+			              	
+			              	TestTextInsert(fileHeader, fileFooter, '\n', list, list.Items.First(i => i.Text == "!--"), "<!--  -->", "<!-- ".Length);
+			              	TestTextInsert(fileHeader, fileFooter, '\n', list, list.Items.First(i => i.Text == "Button"), "<Button", "<Button".Length);
+			              	TestTextInsert(fileHeader, fileFooter, '\n', list, list.Items.First(i => i.Text == "/Grid"), "</Grid>", "</Grid>".Length);
+			              });
+		}
+		
+		[Test]
+		public void CtrlSpaceClosingTagWithGreaterThanInsertionTest()
+		{
+			string fileHeader = @"<Window x:Class='ICSharpCode.XamlBinding.Tests.CompletionTestsBase'
+	xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+	xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+	<Grid>
+		";
+			string fileFooter = @"
+	</Grid>
+	</Window>";
+			
+			TestCtrlSpace(fileHeader, fileFooter, true,
+			              list => {
+			              	Assert.AreEqual(0, list.PreselectionLength);
+			              	Assert.IsNull(list.SuggestedItem);
+			              	Assert.IsTrue(list.Items.Any());
+			              	
+			              	TestTextInsert(fileHeader, fileFooter, '>', list, list.Items.First(i => i.Text == "/Grid"), "</Grid>", "</Grid>".Length);
+			              });
+		}
+		#endregion
+	}
+}
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs
index dd4ffb14fd..91cbe689d2 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs
@@ -51,5 +51,29 @@ namespace ICSharpCode.XamlBinding.Tests
 			
 			constraint(list);
 		}
+		
+		protected void TestTextInsert(string fileHeader, string fileFooter, char completionChar, ICompletionItemList list, ICompletionItem item, string expectedOutput, int expectedOffset)
+		{
+			this.textEditor.Document.Text = fileHeader + fileFooter;
+			this.textEditor.Caret.Offset = fileHeader.Length;
+			this.textEditor.CreateParseInformation();
+			
+			CompletionContext context = new CompletionContext() {
+				Editor = this.textEditor,
+				CompletionChar = completionChar,
+				StartOffset = textEditor.Caret.Offset,
+				EndOffset = textEditor.Caret.Offset
+			};
+			
+			list.Complete(context, item);
+			
+			if (!context.CompletionCharHandled && context.CompletionChar != '\n')
+				this.textEditor.Document.Insert(this.textEditor.Caret.Offset, completionChar + "");
+			
+			string insertedText = this.textEditor.Document.GetText(fileHeader.Length, this.textEditor.Document.TextLength - fileHeader.Length - fileFooter.Length);
+			
+			Assert.AreEqual(expectedOutput, insertedText);
+			Assert.AreEqual(fileHeader.Length + expectedOffset, textEditor.Caret.Offset);
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
index fc23d8cd68..7d31f4e98b 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
@@ -70,6 +70,7 @@
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="CodeCompletionTests.cs" />
+    <Compile Include="CodeInsertionTests.cs" />
     <Compile Include="CompletionTestsBase.xaml.cs">
       <DependentUpon>CompletionTestsBase.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
index 67c9f138cd..990b68edc2 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
@@ -74,6 +74,7 @@ namespace ICSharpCode.XamlBinding
 					if (cItem.Entity is IProperty || cItem.Entity is IEvent) {
 						if (xamlContext.Description == XamlContextDescription.InTag) {
 							context.Editor.Document.Insert(context.EndOffset, "=\"\"");
+							context.CompletionCharHandled = context.CompletionChar == '=';
 							context.Editor.Caret.Offset--;
 							XamlCodeCompletionBinding.Instance.CtrlSpace(context.Editor);
 						} else if (xamlContext.Description == XamlContextDescription.InMarkupExtension && !string.IsNullOrEmpty(xamlContext.RawAttributeValue)) {
@@ -140,6 +141,7 @@ namespace ICSharpCode.XamlBinding
 				
 				if (item.Text.StartsWith("/", StringComparison.OrdinalIgnoreCase)) {
 					context.Editor.Document.Insert(context.EndOffset, ">");
+					context.CompletionCharHandled = context.CompletionChar == '>';
 					context.Editor.Caret.Offset++;
 				}
 			}
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs
index 438ccc93fc..4954dfdb94 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs
@@ -182,6 +182,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			else if (kea != null && kea.Key == Key.Tab)
 				context.CompletionChar = '\t';
 			window.ItemList.Complete(context, item);
+			if (context.CompletionCharHandled && txea != null)
+				txea.Handled = true;
 		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs
index 03916a7515..9978a0af29 100644
--- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs
+++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs
@@ -39,5 +39,10 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
 		/// This property is '\0' when completion was triggered using the mouse.
 		/// </summary>
 		public char CompletionChar { get; set; }
+		
+		/// <summary>
+		/// Gets/Sets whether the CompletionChar was already inserted.
+		/// </summary>
+		public bool CompletionCharHandled { get; set; }
 	}
 }