diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs
index 81724b061..f9b2801d1 100644
--- a/ApplicationView/PrinterModels.cs
+++ b/ApplicationView/PrinterModels.cs
@@ -193,8 +193,6 @@ namespace MatterHackers.MatterControl
 
 		public GCodeRenderInfo RenderInfo { get; set; }
 
-		BedMeshGenerator bedGenerator;
-
 		private Mesh _bedMesh;
 		public Mesh Mesh
 		{
@@ -202,12 +200,10 @@ namespace MatterHackers.MatterControl
 			{
 				if (_bedMesh == null)
 				{
-					bedGenerator = new BedMeshGenerator();
 
-					//Construct the thing
-					var bedAndVolume = bedGenerator.CreatePrintBedAndVolume(Printer);
-					_bedMesh = bedAndVolume.bed;
-					_buildVolumeMesh = bedAndVolume.volume;
+					// Load bed and build volume meshes
+					var bedGenerator = new BedMeshGenerator();
+					(_bedMesh, _buildVolumeMesh) = bedGenerator.CreatePrintBedAndVolume(Printer);
 
 					Task.Run(() =>
 					{
diff --git a/Library/Widgets/PrintLibraryWidget.cs b/Library/Widgets/PrintLibraryWidget.cs
index 61e005079..fa5a23ef9 100644
--- a/Library/Widgets/PrintLibraryWidget.cs
+++ b/Library/Widgets/PrintLibraryWidget.cs
@@ -39,6 +39,7 @@ using MatterHackers.Localizations;
 using MatterHackers.MatterControl.CustomWidgets;
 using MatterHackers.MatterControl.Library;
 using MatterHackers.MatterControl.PartPreviewWindow;
+using MatterHackers.MatterControl.PrinterCommunication;
 using MatterHackers.MatterControl.PrintQueue;
 
 namespace MatterHackers.MatterControl.PrintLibrary
@@ -407,7 +408,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
 					// Singleselect - disallow containers
 					return listView.SelectedItems.Count == 1
 						&& selectedListItems.FirstOrDefault()?.Model is ILibraryItem firstItem
-						&& !(firstItem is ILibraryContainer);
+						&& !(firstItem is ILibraryContainer)
+						&& ApplicationController.Instance.DragDropData?.Printer.Connection.CommunicationState == CommunicationStates.Connected;
 				}
 			});