diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 9d9cef70..8e08eafe 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -1004,9 +1004,8 @@ namespace VEPROMS
 						// 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;
-						displayTags.Visible = true;
+						displayTags.IsVisible = 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;
@@ -1020,8 +1019,11 @@ namespace VEPROMS
 					dlgFindReplace.MyStepItem = args.MyStepItem;
 					SpellChecker.MyStepItem = args.MyStepItem;
 				}
-				if (tc.SelectedDisplayTabItem != null)
-					SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
+				if (args.MyStepItem != null)
+				{
+					SelectedStepTabPanel = args.MyStepItem.MyStepPanel.MyStepTabPanel;
+					//SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
+				}
 			}
 			ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
 			AnnotationPanelView();
diff --git a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs
index 7233d0c6..178f9f75 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs
@@ -244,6 +244,7 @@ namespace Volian.Controls.Library
 			// 
 			// lbFound
 			// 
+			this.lbFound.Dock = System.Windows.Forms.DockStyle.Top;
 			this.lbFound.FormattingEnabled = true;
 			this.lbFound.ItemHeight = 16;
 			this.lbFound.Location = new System.Drawing.Point(0, 218);
diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index dd1268de..fac983dd 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -92,14 +92,19 @@ namespace Volian.Controls.Library
 			lbFound.SelectionMode = SelectionMode.None;
 			lbFound.DataSource = null;
 			//Spin through ROs looking for the selected text
-			string lookFor = _MyRTB.SelectedText;
-			List<ROFSTLookup.roChild> children = _MyROFST.ROFSTLookup.GetRosByValue(lookFor);
-			if (children != null)
+			if (_MyRTB.SelectedText != "")
 			{
-				lbFound.Visible = true;
-				lbFound.DataSource = children.ToArray();
-				lbFound.SelectionMode = SelectionMode.One;
-				lbFound.SelectedIndex = -1;
+				string lookFor = _MyRTB.SelectedText;
+				List<ROFSTLookup.roChild> children = _MyROFST.ROFSTLookup.GetRosByValue(lookFor);
+				if (children != null)
+				{
+					lbFound.Visible = true;
+					lbFound.DataSource = children.ToArray();
+					lbFound.SelectionMode = SelectionMode.One;
+					lbFound.SelectedIndex = -1;
+				}
+				else
+					lbFound.Visible = false;
 			}
 			else
 				lbFound.Visible = false;