diff --git a/PROMS/Volian.Controls.Library/FindReplace.cs b/PROMS/Volian.Controls.Library/FindReplace.cs
index c1bbe352..b6af5431 100644
--- a/PROMS/Volian.Controls.Library/FindReplace.cs
+++ b/PROMS/Volian.Controls.Library/FindReplace.cs
@@ -163,10 +163,7 @@ namespace Volian.Controls.Library
 			{
 				ItemInfo next = (cbxReverse.Checked) ? MyEditItem.MyItemInfo.SearchPrev : MyEditItem.MyItemInfo.SearchNext;
 
-				// TODO: Searchable text for grids/tables will be in MyContent.Text - but is not there now. 
-				//   uncomment next line and remove following line (and it's associated method code) when it is available.
-				//while (!next.IsSection && !next.MyContent.Text.ToUpper().Contains(cmboFindText.Text.ToUpper()))
-				while (!next.IsSection && !FindNextText(next))
+				while (!next.IsSection && !next.MyContent.Text.ToUpper().Contains(cmboFindText.Text.ToUpper()))
 					next = (cbxReverse.Checked) ? next.SearchPrev : next.SearchNext;
 				if (next.IsSection)
 				{
@@ -179,9 +176,11 @@ namespace Volian.Controls.Library
 					}
 					return;
 				}
-					MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
-					if (cbxReverse.Checked)
-						MyEditItem.PositionToEnd();
+				
+				MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
+				if (cbxReverse.Checked)
+					MyEditItem.PositionToEnd();
+				if (next.IsTable && !cbxReverse.Checked) MyEditItem.PositionToStart();
 			}
 			if (MyEditItem.MyStepRTB != null && !MyEditItem.MyStepRTB.Visible)
 			{