diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index b905f6adb..35ae7e09a 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -4131,7 +4131,11 @@ begin
   DHL:=THackDataLink(Datalink);
   DHS:=THackDataSet(DataSource.DataSet);
 
-  P := DHS.GetBookMark;
+  {$IFDEF NoAutomatedBookmark}
+  P:=DataSource.DataSet.GetBookmark;
+  {$ELSE}
+  P := DHS.Bookmark;
+  {$ENDIF}
 
   SaveState:=DHS.SetTempState(dsBrowse);
 
@@ -4181,7 +4185,17 @@ begin
   DHS.BeforeScroll := SaveBeforeScroll;
 
   if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
+  begin
+    {$IFDEF NoAutomatedBookmark}
+    DHS.GotoBookmark(P); //workaround for fix navigation problem
+    {$ELSE}
     DHS.Bookmark:=P; //workaround for fix navigation problem
+    {$ENDIF}
+  end;
+
+  {$IFDEF NoAutomatedBookmark}
+  DHS.FreeBookmark(P);
+  {$ENDIF}
 
   Dec(FInProcessCalc);
   if FInProcessCalc < 0 then