diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index 01efe458..4412f921 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -561,7 +561,8 @@ namespace Volian.Controls.Library
 				if (deletingParent && newFocus != null) 
 					value = newFocus;
 				_SelectedEditItem = value;
-				MyStepTabPanel.MyStepTabRibbon.MyEditItem = value;// Update StepTabRibbon.MyEditItem to match
+				if (MyStepTabPanel != null)
+					MyStepTabPanel.MyStepTabRibbon.MyEditItem = value;// Update StepTabRibbon.MyEditItem to match
 				if (value != null)
 				{
 					_SelectedEditItem.RefreshDisplay(true);