diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index 81b07bd4..9725eac1 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -837,7 +837,8 @@ namespace Volian.Controls.Library
 		private bool _ContextMenuStripChanged = false;
 		private void StepRTB_MouseDown(object sender, MouseEventArgs e)
 		{
-			
+			//The following line fixes bugs B2016-121 and B2016-146
+			if(!Focused)this.Focus();// If it doesn't have focus, set focus to the selected item
 			//Console.WriteLine("vvvvvvvvvv StepRTB Mouse Down id= {0}",MyItemInfo.ItemID);
 			bool inPsi = this.Parent.FindForm().Name.Contains("frmPSI");
 			if (!_ContextMenuStripChanged)
@@ -1039,6 +1040,10 @@ namespace Volian.Controls.Library
 			set { _LastRtf = value; }
 		}
 		private bool _lastReadOnly = false;
+		public override string ToString()
+		{
+			return string.Format("[StepRTB {0},{1},{2}]", MyItemInfo.ItemID, MyItemInfo.DisplayNumber, MyItemInfo.DisplayText);
+		}
 		private void AddRtfText(string txt)
 		{
 			//Console.WriteLine("ItemID:{0}", MyItemInfo.ItemID);