1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/fpg_basegrid.pas b/src/gui/fpg_basegrid.pas
index a1cc01d0..6a1fd8b0 100644
--- a/src/gui/fpg_basegrid.pas
+++ b/src/gui/fpg_basegrid.pas
@@ -392,8 +392,9 @@ begin
     FFocusRow := 0;
   if FFocusRow > RowCount-1 then
     FFocusRow := RowCount-1;
-    
-  FollowFocus;
+
+//  FollowFocus;
+  Update;
   CheckFocusChange;
 end;
 
@@ -1150,7 +1151,10 @@ end;
 
 procedure TfpgBaseGrid.Update;
 begin
-  UpdateScrollBars;
+  if csUpdating in ComponentState then
+    Exit;
+
+//  UpdateScrollBars;
   FollowFocus;
   RePaint;
 end;