diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index b97b7c58..c4c6ecbb 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -623,8 +623,11 @@ namespace Volian.Controls.Library
 			{
 				Focus();
 				MyFlexGrid.Focus();
-				//if (!MyFlexGrid.IsRoTable) // Table ROs are none editable - don't select a table cell
-				//    MyFlexGrid.Select(0, 0);
+				if (!MyFlexGrid.IsRoTable) // Table ROs are none editable - don't select a table cell
+				{
+					MyFlexGrid.Select(0, 0);
+					MyFlexGrid.FirstEntry = true; // to fix a problem with initial mouse click into table
+				}
 			}
 			else
 			{