diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
index 04669cbb47..ff88438cc2 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
@@ -43,6 +43,13 @@
 		<CodeCompletionBinding id = "XAML" extensions = ".xaml" class = "ICSharpCode.XamlBinding.XamlCodeCompletionBinding"/>
 	</Path>
 	
+	<Path name="/SharpDevelop/Workbench/LanguageBindings">
+		<LanguageBinding
+			id="XAML"
+			class="ICSharpCode.XamlBinding.XamlLanguageBinding"
+			extensions=".xaml" />
+	</Path>
+	
 	<Path name="/SharpDevelop/ViewContent/TextEditor/Extensions">
 		<TextEditorExtension
 			id="XAML"
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs
index 99c18d498f..ffb8d9f1e6 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs
@@ -47,8 +47,9 @@ namespace ICSharpCode.XamlBinding
 				if (asmIndex >= 0) {
 					string asmName = name.Substring(asmIndex + ";assembly=".Length);
 					asm = compilation.ReferencedAssemblies.FirstOrDefault(a => a.AssemblyName == asmName) ?? compilation.MainAssembly;
+					name = name.Substring(0, asmIndex);
 				}
-				string[] parts = name.Substring(0, asmIndex).Split('.');
+				string[] parts = name.Split('.');
 				var @namespace = FindNamespace(asm, parts);
 				if (@namespace != null) yield return @namespace;
 			} else {
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs
index 30fcd3d031..6a6d26f335 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs
@@ -13,7 +13,6 @@ namespace ICSharpCode.XamlBinding
 	/// <summary>
 	/// Description of XamlTextEditorExtension.
 	/// </summary>
-	[TextEditorService]
 	public class XamlTextEditorExtension : XmlEditor.XmlTextEditorExtension
 	{
 //		XamlColorizer colorizer;
@@ -65,4 +64,9 @@ namespace ICSharpCode.XamlBinding
 			}
 		}
 	}
+	
+	public class XamlLanguageBinding : XmlEditor.XmlLanguageBinding
+	{
+		
+	}
 }