diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 7cf47835..252f1fdf 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -695,7 +695,7 @@ namespace Volian.Controls.Library
 			// and fixes a problem where an edit window would end up on top of the ones above it
 			EditItem ei = newFocus;
 			while (ei.MyPreviousEditItem != null) ei = ei.MyPreviousEditItem;
-			if (ei.MyParentEditItem != null)
+			if (ei.MyParentEditItem != null && ei.MyParentEditItem.MyItemInfo.IsStep)
 				ei.MyParentEditItem.Expand(true);
 		}
 		public EditItem DeleteItem()
@@ -2248,6 +2248,8 @@ namespace Volian.Controls.Library
 		}
 		protected void SetupEditItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, bool addFirstChld)
 		{
+			if (itemInfo.ItemID == 1359)
+				Console.WriteLine("jcb");
 			if (myStepPanel.TopMostEditItem == null) myStepPanel.TopMostEditItem = this;
 			//if (itemInfo.ItemID == 10366) Console.WriteLine("Here");
 			//if (itemInfo.ItemID == 225) _MyStepRTB.Resize += new EventHandler(_MyStepRTB_Resize);