diff --git a/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs b/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs
index 00540cb71..9fc575761 100644
--- a/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs
+++ b/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs
@@ -36,7 +36,7 @@ namespace MatterHackers.MatterControl
 {
 	public class NozzleOffsetTemplateWidget : FlowLayoutWidget
 	{
-		private double _activeOffset;
+		private double? _activeOffset = null;
 		private ThemeConfig theme;
 
 		public event EventHandler OffsetChanged;
@@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl
 
 		public double ActiveOffset
 		{
-			get => _activeOffset;
+			get => _activeOffset ?? 0;
 			set
 			{
 				if (value != _activeOffset)
diff --git a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
index 0c46b252c..1cfc93169 100644
--- a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
+++ b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
@@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			{
 				_image = new ImageBuffer(16, 16);
 
-				this.HighlightRegion.AddChild(imageWidget = new ImageWidget(this.Image)
+				this.HighlightRegion.AddChild(imageWidget = new ImageWidget(this.Image, listenForImageChanged: false)
 				{
 					VAnchor = VAnchor.Center,
 					Margin = new BorderDouble(right: 4),