diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index be5419df..f2f4e3ec 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -259,14 +259,12 @@ namespace VEPROMS
 			SetupButtons();
 			displayBookMarks.MyDisplayTabControl = tc;		// allows bookmark selection to bring up steps/docs
 			office2007StartButton1.MouseDown +=new MouseEventHandler(office2007StartButton1_MouseDown);
-			displayRO.EnabledChanged += new EventHandler(displayRO_EnabledChanged);
+			//displayRO.EnabledChanged += new EventHandler(displayRO_EnabledChanged);
 		}
-
-		void displayRO_EnabledChanged(object sender, EventArgs e)
-		{
-			Console.WriteLine("here");
-		}
-
+		//void displayRO_EnabledChanged(object sender, EventArgs e)
+		//{
+		//  Console.WriteLine("here");
+		//}
 		void _MyMRIList_AfterRemove(object sender)
 		{
 			SetupMRU();
@@ -1053,7 +1051,7 @@ namespace VEPROMS
 				displayRO.Enabled = displayTransition.Enabled = _LastStepRTB.EditMode;
 			else  // going out of edit mode in a cell of the grid.
 			{
-				if (!_LastStepRTB.Parent.Focused && (infotabRO.IsSelected || infotabTransition.IsSelected)) return;
+				if (this.ActiveControl != tc || (!_LastStepRTB.Parent.Focused && (infotabRO.IsSelected || infotabTransition.IsSelected))) return;
 				displayRO.Enabled = displayTransition.Enabled = _LastStepRTB.EditMode;
 			}
 		}