diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs
index 70f631b6f..0d7a8e072 100644
--- a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs
+++ b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs
@@ -168,11 +168,12 @@ namespace MatterHackers.MatterControl.ActionBar
 		private void EnableControls()
 		{
 			bool status =  printer.Connection.IsConnected && !printer.Connection.PrinterIsPrinting;
-			if (isEnabled != status)
+			if (isEnabled != status
+				&& this.PopupContent is GuiWidget popupContent)
 			{
 				isEnabled = status;
 
-				var flowLayout = this.PopupContent.Children.OfType<FlowLayoutWidget>().FirstOrDefault();
+				var flowLayout = popupContent.Children.OfType<FlowLayoutWidget>().FirstOrDefault();
 				if (flowLayout != null)
 				{
 					foreach (var child in flowLayout.Children.Except(alwaysEnabled))
diff --git a/MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs b/MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs
index 530f54941..fee9f2b0f 100644
--- a/MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs
+++ b/MatterControlLib/Library/Providers/MatterControl/LibraryCollectionContainer.cs
@@ -54,6 +54,16 @@ namespace MatterHackers.MatterControl.Library
 						() => new SqliteLibraryContainer(rootLibraryCollection.Id)));
 			}
 
+			this.ChildContainers.Add(
+				new DynamicContainerLink(
+					() => "Calibration Parts".Localize(),
+					AggContext.StaticData.LoadIcon(Path.Combine("Library", "folder_20x20.png")),
+					AggContext.StaticData.LoadIcon(Path.Combine("Library", "folder.png")),
+					() => new CalibrationPartsContainer())
+				{
+					IsReadOnly = true
+				});
+
 			this.ChildContainers.Add(
 				new DynamicContainerLink(
 					() => "Primitives".Localize(),