diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 604d1271..c8437007 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -2503,6 +2503,8 @@ namespace Volian.Controls.Library
 					MyStepPanel.ItemMoving--;
 				}
 			}
+			else  // B2018-072 nextEditItem is null, remove "this" from AdjustItems list, otherwise get infinate loop in ProcessAdjustItems() on last HSL with RNO but no AER substeps
+				if (AdjustItems.Contains(this))	AdjustItems.Remove(this);
 		}
 		private static List<EditItem> _AdjustItems=new List<EditItem>();// B2017-175 Keep a list of EditItems to adjust after expanding
 		public static List<EditItem> AdjustItems