diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index 5b0b0faa..94341c94 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -297,6 +297,7 @@ namespace Volian.Controls.Library
 			get { return _SelectedStepRTB; }
 			set 
 			{
+				StepRTB lastRTB = _SelectedStepRTB;
 				if(value != null)
 					value.BackColor = ActiveColor; // Set the active color
 				if (_SelectedStepRTB == value) return; // Same - No Change
@@ -304,11 +305,18 @@ namespace Volian.Controls.Library
 				{
 					_SelectedStepRTB.BackColor = InactiveColor;
 					_SelectedStepRTB.SaveText(); // Save any changes to the text
-					_SelectedStepRTB.SaveConfig();		// This may be redundant 
+					_SelectedStepRTB.SaveConfig();		// This may be redundant
+					_SelectedStepRTB.RTBFillIn(false);
+					_SelectedStepRTB.ViewRTB = true;
 				}
 				_SelectedStepRTB = value;
-				if (value != null && _SelectedItemInfo.ItemID != value.MyItemInfo.ItemID) 
-					SelectedItemInfo = value.MyItemInfo;
+				if (value != null)
+				{
+					_SelectedStepRTB.ViewRTB = false;
+					_SelectedStepRTB.RTBFillIn(true);
+					if (_SelectedItemInfo.ItemID != value.MyItemInfo.ItemID)
+						SelectedItemInfo = value.MyItemInfo;
+				}
 				//vlnStackTrace.ShowStack("_DisplayRTB = {0}", _DisplayRTB.MyItem.ItemID);// Show StackTrace
 			}
 		}