diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 439bdc77..65658c5b 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -898,6 +898,8 @@ namespace VEPROMS
 				ctrlAnnotationDetails.CurrentAnnotation = null;
 				ctrlAnnotationDetails.Annotations = null;
 				infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = false;
+				// When infotabTags is set to InVisible, the matching panel also needs to be set to invisible
+				infotabControlPanelTags.Visible = false;
 				SelectedStepTabPanel = null;
 			}
 			else
@@ -925,6 +927,11 @@ namespace VEPROMS
 				{
 					//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
 					infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true;
+					// When infotabTags is set to Visible, the matching panel also needs to be set to visible
+					// the other panels will appear as they are selected by the user.
+					infotabControlPanelTags.Visible = true;
+					// When infotabTags is set to Visible, it is given focus.  The next line returns focus to the StepRTB
+					args.MyStepItem.MyStepRTB.Focus();
 					displayTransition.MyRTB = args.MyStepItem.MyStepRTB;
 					displayRO.MyRTB = args.MyStepItem.MyStepRTB;
 					displayTags.MyRTB = args.MyStepItem.MyStepRTB;