diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 5738e4d2..867f4db7 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -2393,6 +2393,7 @@ namespace Volian.Controls.Library
 		 /// </summary>
 		internal void AdjustLocation()
 		{
+			if (MyStepPanel.ShuttingDown) return;
 			if (RNORight) MoveRNO(); // This is needed when an AER is Deleted that has an RNO.
 			MoveSupInfo();		// If the current item has supplemental information, be sure its top location is that of the current item.
 			if (RNOLevel > 0 && AEREditItem != null)
diff --git a/PROMS/Volian.Controls.Library/StepPanel.designer.cs b/PROMS/Volian.Controls.Library/StepPanel.designer.cs
index 08510a93..10cab5a9 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.designer.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.designer.cs
@@ -7,12 +7,20 @@ namespace Volian.Controls.Library
 		/// </summary>
 		private System.ComponentModel.IContainer components = null;
 
+		private bool _ShuttingDown = false;
+
+		public bool ShuttingDown
+		{
+			get { return _ShuttingDown; }
+			set { _ShuttingDown = value; }
+		}
 		/// <summary> 
 		/// Clean up any resources being used.
 		/// </summary>
 		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
 		protected override void Dispose(bool disposing)
 		{
+			ShuttingDown = disposing;
 			if (disposing && (components != null))
 			{
 				SelectedEditItem = null; // Save Changes