diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index f85547c0a..77ba9b31b 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -62,7 +62,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="9" Y="16"/>
-        <UsageCount Value="96"/>
+        <UsageCount Value="97"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -75,7 +75,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="62"/>
         <CursorPos X="15" Y="76"/>
-        <UsageCount Value="96"/>
+        <UsageCount Value="97"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -105,12 +105,12 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="158"/>
-        <CursorPos X="1" Y="173"/>
+        <TopLine Value="3367"/>
+        <CursorPos X="1" Y="3397"/>
         <UsageCount Value="16"/>
         <Bookmarks Count="2">
           <Item0 X="1" Y="2564" ID="2"/>
-          <Item1 X="1" Y="4785" ID="1"/>
+          <Item1 X="1" Y="4791" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
       </Unit5>
@@ -844,126 +844,126 @@
         <UsageCount Value="10"/>
       </Unit101>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="30" HistoryIndex="28">
       <Position1>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="3553" Column="5" TopLine="3506"/>
+        <Caret Line="4309" Column="1" TopLine="4290"/>
       </Position1>
       <Position2>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="3553" Column="1" TopLine="3538"/>
+        <Caret Line="4310" Column="1" TopLine="4290"/>
       </Position2>
       <Position3>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4306" Column="1" TopLine="4290"/>
+        <Caret Line="4312" Column="1" TopLine="4290"/>
       </Position3>
       <Position4>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4308" Column="1" TopLine="4290"/>
+        <Caret Line="176" Column="1" TopLine="148"/>
       </Position4>
       <Position5>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4309" Column="1" TopLine="4290"/>
+        <Caret Line="168" Column="45" TopLine="155"/>
       </Position5>
       <Position6>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4310" Column="1" TopLine="4290"/>
+        <Caret Line="162" Column="25" TopLine="157"/>
       </Position6>
       <Position7>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4312" Column="1" TopLine="4290"/>
+        <Caret Line="173" Column="64" TopLine="149"/>
       </Position7>
       <Position8>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="176" Column="1" TopLine="148"/>
+        <Caret Line="435" Column="53" TopLine="399"/>
       </Position8>
       <Position9>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="168" Column="45" TopLine="155"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position9>
       <Position10>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="162" Column="25" TopLine="157"/>
+        <Caret Line="671" Column="30" TopLine="647"/>
       </Position10>
       <Position11>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="173" Column="64" TopLine="149"/>
+        <Caret Line="165" Column="26" TopLine="149"/>
       </Position11>
       <Position12>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="435" Column="53" TopLine="399"/>
+        <Caret Line="173" Column="63" TopLine="149"/>
       </Position12>
       <Position13>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="160" Column="17" TopLine="155"/>
       </Position13>
       <Position14>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="671" Column="30" TopLine="647"/>
+        <Caret Line="437" Column="94" TopLine="411"/>
       </Position14>
       <Position15>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="165" Column="26" TopLine="149"/>
+        <Caret Line="4699" Column="29" TopLine="4697"/>
       </Position15>
       <Position16>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="173" Column="63" TopLine="149"/>
+        <Caret Line="160" Column="15" TopLine="153"/>
       </Position16>
       <Position17>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="160" Column="17" TopLine="155"/>
+        <Caret Line="448" Column="45" TopLine="421"/>
       </Position17>
       <Position18>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="437" Column="94" TopLine="411"/>
+        <Caret Line="4775" Column="23" TopLine="4766"/>
       </Position18>
       <Position19>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4699" Column="29" TopLine="4697"/>
+        <Caret Line="403" Column="16" TopLine="399"/>
       </Position19>
       <Position20>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="160" Column="15" TopLine="153"/>
+        <Filename Value="../../../../lcl/dbgrids.pas"/>
+        <Caret Line="216" Column="3" TopLine="210"/>
       </Position20>
       <Position21>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="448" Column="45" TopLine="421"/>
+        <Filename Value="../../../../lcl/grids.pas"/>
+        <Caret Line="11296" Column="3" TopLine="11292"/>
       </Position21>
       <Position22>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4775" Column="23" TopLine="4766"/>
+        <Caret Line="430" Column="39" TopLine="405"/>
       </Position22>
       <Position23>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="403" Column="16" TopLine="399"/>
+        <Caret Line="4772" Column="33" TopLine="4767"/>
       </Position23>
       <Position24>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="216" Column="3" TopLine="210"/>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="734" Column="1" TopLine="730"/>
       </Position24>
       <Position25>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="11296" Column="3" TopLine="11292"/>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position25>
       <Position26>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="430" Column="39" TopLine="405"/>
+        <Caret Line="164" Column="84" TopLine="150"/>
       </Position26>
       <Position27>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4772" Column="33" TopLine="4767"/>
+        <Caret Line="168" Column="32" TopLine="158"/>
       </Position27>
       <Position28>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="734" Column="1" TopLine="730"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position28>
       <Position29>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="3386" Column="5" TopLine="3358"/>
       </Position29>
       <Position30>
         <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="164" Column="84" TopLine="150"/>
+        <Caret Line="3349" Column="49" TopLine="3333"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
index 9a46312fa..c6f47c29a 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -227,42 +227,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
             OnClick = TRxColumnEditButtons1Click
           end>
       end>
-    KeyStrokes = <    
-      item
-        Command = rxgcShowFindDlg
-        ShortCut = 57414
-        Enabled = True
-      end    
-      item
-        Command = rxgcShowColumnsDlg
-        ShortCut = 16471
-        Enabled = True
-      end    
-      item
-        Command = rxgcShowFilterDlg
-        ShortCut = 16468
-        Enabled = True
-      end    
-      item
-        Command = rxgcShowSortDlg
-        ShortCut = 16467
-        Enabled = True
-      end    
-      item
-        Command = rxgcShowQuickFilter
-        ShortCut = 16465
-        Enabled = True
-      end    
-      item
-        Command = rxgcHideQuickFilter
-        ShortCut = 16456
-        Enabled = True
-      end    
-      item
-        Command = rxgcCopyCellValue
-        ShortCut = 16451
-        Enabled = True
-      end>
     FooterOptions.Active = True
     FooterOptions.Color = clYellow
     FooterOptions.RowCount = 1
@@ -282,7 +246,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
     Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgMultiselect, dgHeaderPushedLook]
     ParentColor = False
     PopupMenu = PopupMenu1
-    Scrollbars = ssVertical
     TabOrder = 0
     TitleStyle = tsNative
     UseXORFeatures = True
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 5a86f7d5c..e0aadea12 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -3349,7 +3349,7 @@ end;
 procedure TRxDBGrid.DoTitleClick(ACol: longint; ACollumn: TRxColumn;
   Shift: TShiftState);
 begin
-  if FAutoSort and (FSortEngine <> nil) and (ACollumn.Field <> nil) then
+  if FAutoSort {and (FSortEngine <> nil)} and (ACollumn.Field <> nil) then
   begin
     if ssCtrl in Shift then
     begin
@@ -3386,7 +3386,8 @@ begin
     end;
 
     CollumnSortListUpdate;
-    CollumnSortListApply;
+    if (FSortEngine <> nil) then
+      CollumnSortListApply;
   end
   else
     HeaderClick(True, ACol);