diff --git a/PrinterControls/PrinterConnections/PrinterChooser.cs b/CustomWidgets/BoundDropList.cs
similarity index 100%
rename from PrinterControls/PrinterConnections/PrinterChooser.cs
rename to CustomWidgets/BoundDropList.cs
diff --git a/MatterControl.csproj b/MatterControl.csproj
index 204acea93..8a2f0c1c2 100644
--- a/MatterControl.csproj
+++ b/MatterControl.csproj
@@ -274,6 +274,7 @@
     <Compile Include="PrinterControls\MacroDetailPage.cs" />
     <Compile Include="PrinterControls\MacroListPage.cs" />
     <Compile Include="PrinterControls\MovementSpeedsPage.cs" />
+    <Compile Include="CustomWidgets\BoundDropList.cs" />
     <Compile Include="PrinterControls\PrinterConnections\PrinterSetup.cs" />
     <Compile Include="RootSystemWindow.cs" />
     <Compile Include="SetupWizard\DialogWindow.cs" />
@@ -512,7 +513,6 @@
     <Compile Include="PrinterControls\PrinterConnections\SetupStepMakeModelName.cs" />
     <Compile Include="PrinterControls\PrinterConnections\SetupStepBaudRate.cs" />
     <Compile Include="PrinterControls\ManualPrinterControls.cs" />
-    <Compile Include="PrinterControls\PrinterConnections\PrinterChooser.cs" />
     <Compile Include="Library\Widgets\PrintLibraryWidget.cs" />
     <Compile Include="Queue\PrintItemWrapper.cs" />
     <Compile Include="MatterControlApplication.cs" />
diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj
index 60a6431e2..d9f0de79a 100644
--- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj
+++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj
@@ -57,6 +57,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MatterControl\ApplicationControllerTests.cs" />
+    <Compile Include="MatterControl\BoundDropListTests.cs" />
     <Compile Include="MatterControl\BrailleGrade2Tests.cs" />
     <Compile Include="MatterControl\PopupAnchorTests.cs" />
     <Compile Include="MatterControl\InteractiveSceneTests.cs" />
@@ -70,7 +71,6 @@
     <Compile Include="MatterControl\MatterControlUiFeatures.cs" />
     <Compile Include="MatterControl\MatterControlUtilities.cs" />
     <Compile Include="MatterControl\OemProfileTests.cs" />
-    <Compile Include="MatterControl\PrinterChooserUnitTests.cs" />
     <Compile Include="MatterControl\PrinterConfigurationTests.cs" />
     <Compile Include="MatterControl\PrinterWhiteListTests.cs" />
     <Compile Include="MatterControl\ReleaseBuildTests.cs" />
diff --git a/Tests/MatterControl.Tests/MatterControl/PrinterChooserUnitTests.cs b/Tests/MatterControl.Tests/MatterControl/BoundDropListTests.cs
similarity index 73%
rename from Tests/MatterControl.Tests/MatterControl/PrinterChooserUnitTests.cs
rename to Tests/MatterControl.Tests/MatterControl/BoundDropListTests.cs
index 831377786..14e88b6a6 100644
--- a/Tests/MatterControl.Tests/MatterControl/PrinterChooserUnitTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/BoundDropListTests.cs
@@ -10,10 +10,10 @@ using NUnit.Framework;
 
 namespace MatterControl.Tests.MatterControl
 {
-	class PrinterChooserUnitTests
+	class BoundDropListTests
 	{
 		[Test]
-		public void PrinterChooserHonorsWhitelist()
+		public void BoundDropListHonorsWhitelist()
 		{
 			AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
 			MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
@@ -26,8 +26,9 @@ namespace MatterControl.Tests.MatterControl
 
 			var theme = new ThemeConfig()
 			{
-				Colors = ActiveTheme.Instance 
+				Colors = ActiveTheme.Instance
 			};
+
 			// Whitelist on non-OEM builds should contain all printers
 			dropList = new BoundDropList("Test", theme);
 			dropList.ListSource = allManufacturers;
@@ -47,26 +48,6 @@ namespace MatterControl.Tests.MatterControl
 			dropList = new BoundDropList("Test", theme);
 			dropList.ListSource = OemSettings.Instance.AllOems;
 			Assert.AreEqual(2, dropList.MenuItems.Count);
-
-			/* 
-			 * Disable Esagono tests
-			 * 
-			SetPrivatePrinterWhiteListMember(new List<string>() { "Esagono" });
-			var manufacturerNameMapping = new ManufacturerNameMapping();
-			manufacturerNameMapping.NameOnDisk = "Esagono";
-			manufacturerNameMapping.NameToDisplay = "Esagonò";
-			printChooser = new PrinterChooser();
-
-			string expectedItem = null;
-			foreach (var menuItem in printChooser.ManufacturerDropList.MenuItems)
-			{
-				if(menuItem.Text.StartsWith("Esa"))
-				{
-					expectedItem = menuItem.Text;
-				}
-			}
-			Assert.IsTrue(!string.IsNullOrEmpty(expectedItem) && expectedItem == "Esagonò");
-			*/
 		}
 	}
 }