diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index 22b1d5f9..c74f6d73 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -332,7 +332,7 @@ namespace Volian.Controls.Library
 				if(value != null)
 					value.BackColor = ActiveColor; // Set the active color
 				if (_SelectedStepRTB == value) return; // Same - No Change
-				if (_SelectedStepRTB != null)
+				if (_SelectedStepRTB != null && _SelectedStepRTB.BeingDisposed == false)
 				{
 					//_SelectedStepRTB.BackColor = InactiveColor;
 					_SelectedStepRTB.SetBackColor();
@@ -392,7 +392,7 @@ namespace Volian.Controls.Library
 		/// </summary>
 		public void ItemShow()
 		{
-			if (_SelectedItemInfo != null)
+			if (_SelectedItemInfo != null && SelectedStepItem.MyStepRTB.BeingDisposed == false)
 			{
 				SelectedStepItem.ItemShow();
 				OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(SelectedStepItem));