diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index eb51397e..b8d292a3 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -3663,6 +3663,8 @@ namespace Volian.Controls.Library
 			TabLeft = 20;
 			if (!itemInfo.IsStep)  // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
 				SetupHeader(itemInfo);
+			//B2026-093  move the setting of MyStepPanel to fix null reference error when the Alarm Point Table is first setup for the editor view
+			MyStepPanel = myStepPanel;
 			SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
 			this.Paint -= new PaintEventHandler(EditItem_Paint);
 			this.Paint += new PaintEventHandler(EditItem_Paint);
@@ -3707,7 +3709,6 @@ namespace Volian.Controls.Library
 				if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
 			}
 			if (expand) ShowExpanded();
-			MyStepPanel = myStepPanel;
 			if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
 			_MyChildRelation = myChildRelation;
 			if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;