diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/DropDownEditor.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/WixDropDownEditor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/DropDownEditor.cs
rename to src/AddIns/BackendBindings/WixBinding/Project/Src/PropertyGrid/WixDropDownEditor.cs
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
index 6c4471a81d..ebf9167a25 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
+++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
@@ -141,7 +141,7 @@
     <Compile Include="Src\PropertyGrid\GuidEditor.cs" />
     <Compile Include="Src\PropertyGrid\GuidEditorListBox.cs" />
     <Compile Include="Src\PropertyGrid\RelativeFileNameEditor.cs" />
-    <Compile Include="Src\PropertyGrid\DropDownEditor.cs" />
+    <Compile Include="Src\PropertyGrid\WixDropDownEditor.cs" />
     <Compile Include="Src\WixPackageFilesDiff.cs" />
     <Compile Include="Src\WixPackageFilesDiffResult.cs" />
     <Compile Include="Src\DirectoryReader.cs" />
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs
index 0d2620d8fc..99adfde107 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownPropertyDescriptorTestFixture.cs
@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
 using ICSharpCode.WixBinding;
 using NUnit.Framework;
 using System;
@@ -42,7 +43,7 @@ namespace WixBinding.Tests.PropertyGrid
 		[Test]
 		public void EditorAttributeTypeName()
 		{
-			Assert.AreEqual(typeof(DropDownEditor).AssemblyQualifiedName, editorAttribute.EditorTypeName);
+			Assert.AreEqual(typeof(WixDropDownEditor).AssemblyQualifiedName, editorAttribute.EditorTypeName);
 		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs
index 168a4df88d..616fa531f1 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/PropertyGrid/DropDownTypeEditorTestFixture.cs
@@ -6,6 +6,7 @@
 // </file>
 
 using ICSharpCode.WixBinding;
+using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
 using NUnit.Framework;
 using System;
 using System.Drawing.Design;
@@ -18,7 +19,7 @@ namespace WixBinding.Tests.PropertyGrid
 	[TestFixture]
 	public class DropDownTypeEditorTestFixture
 	{
-		DropDownEditor editor;
+		WixDropDownEditor editor;
 		object newValue;
 		string expectedNewValue;
 		MockServiceProvider mockServiceProvider;
@@ -28,7 +29,7 @@ namespace WixBinding.Tests.PropertyGrid
 		[TestFixtureSetUp]
 		public void SetUpFixture()
 		{
-			editor = new DropDownEditor();
+			editor = new WixDropDownEditor();
 			
 			// Edit the value.
 			mockServiceProvider = new MockServiceProvider();
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs
index 4ef7637a30..51cb31d28a 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWindowsFormsEditorService.cs
@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Widgets.DesignTimeSupport;
 using ICSharpCode.WixBinding;
 using System;
 using System.Windows.Forms;
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
index 111b8c0fc5..4f1836c19c 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
@@ -289,6 +289,14 @@
     <Folder Include="PropertyGrid" />
     <Folder Include="DirectoryImport" />
     <Folder Include="Diff" />
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+    </ProjectReference>
+    <Content Include="..\..\..\..\..\bin\ICSharpCode.SharpDevelop.Widgets.dll">
+      <Link>ICSharpCode.SharpDevelop.Widgets.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/WixBinding/WixBinding.sln b/src/AddIns/BackendBindings/WixBinding/WixBinding.sln
index 03db17373d..24d14c0ddb 100644
--- a/src/AddIns/BackendBindings/WixBinding/WixBinding.sln
+++ b/src/AddIns/BackendBindings/WixBinding/WixBinding.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1697
+# SharpDevelop 2.1.0.1856
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Do
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -74,5 +76,9 @@ Global
 		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal