diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs
index d540acd8..348e7053 100644
--- a/PROMS/Volian.Controls.Library/StepItem.cs
+++ b/PROMS/Volian.Controls.Library/StepItem.cs
@@ -896,7 +896,8 @@ namespace Volian.Controls.Library
 				}
 			}
 			_Moving = false;
-			BottomMostStepItem.AdjustLocation();
+			StepItem btm = BottomMostStepItem;
+			if(this != btm)btm.AdjustLocation();
 		}
 		/// <summary>
 		/// Handle the LinkGoTO event
@@ -1177,6 +1178,9 @@ namespace Volian.Controls.Library
 		{
 			StepItem tmp = NextDownStepItem;
 			if (tmp == null) return;
+			// Debug to show when this is called
+			// vlnStackTrace.ShowStack("{0} From {1} to {2}", tmp.MyPath, tmp.Top, Bottom);
+			// Console.WriteLine("{0} From {1} to {2}", tmp.MyPath, tmp.Top, Bottom);
 			if (tmp != null && !tmp.Moving && tmp.Top != Bottom)
 			{
 				_MyStepPanel.ItemMoving++;