diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index 7f2ff962c..20eaffda8 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -1632,7 +1632,12 @@ end;
 
 procedure TDataSourceLink.FocusControl(Field: TFieldRef);
 begin
-  inherited FocusControl(Field);
+  if Assigned(Field) and (FDataControl.FDataField = Field^) then
+    if FDataControl.CanFocus then
+    begin
+      Field^ := nil;
+      FDataControl.SetFocus;
+    end;
 end;
 
 procedure TDataSourceLink.RecordChanged(Field: TField);