diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 72012e9c0..3fc177013 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -6488,6 +6488,13 @@ begin
rxSortByForm.CheckBox1.Checked := rdgCaseInsensitiveSort in FOptionsRx;
if rxSortByForm.Execute(Self, FSortListField) then
begin
+ for i:=0 to Columns.Count-1 do
+ begin
+ FColumn:=Columns[i];
+ FColumn.FSortPosition:=0;
+ FColumn.FSortOrder:=smNone;
+ end;
+
for i := 0 to FSortListField.Count - 1 do
begin
S1:=FSortListField.Strings[i];
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 0048c2195..fc071a5f2 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -25,7 +25,7 @@
Copyright (c) 1998 Master-Bank
translate to Lazarus by alexs in 2005 - 2020"/>
-
+