diff --git a/components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi
index 58fc4da7d..6f693f606 100644
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi
@@ -70,6 +70,7 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
+        <IsVisibleTab Value="True"/>
         <TopLine Value="138"/>
         <CursorPos X="43" Y="138"/>
         <UsageCount Value="127"/>
@@ -474,10 +475,9 @@
       </Unit56>
       <Unit57>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="5938"/>
-        <CursorPos X="94" Y="5955"/>
+        <TopLine Value="5929"/>
+        <CursorPos X="42" Y="5953"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit57>
diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 22a397d9c..98b8dfa87 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -5486,8 +5486,16 @@ procedure TRxDBGrid.FFilterSimpleEditOnChange(Sender: TObject);
 begin
   with TRxColumn(Columns[Columns.RealIndex(FFilterSimpleEdit.Col)]).Filter do
   begin
-    CurrentValues.Text:=FFilterSimpleEdit.Text;
-    State:=rxfsFilter;
+    if FFilterSimpleEdit.Text = '' then
+    begin
+      CurrentValues.Clear;
+      State:=rxfsAll;
+    end
+    else
+    begin
+      CurrentValues.Text:=FFilterSimpleEdit.Text;
+      State:=rxfsFilter;
+    end;
   end;
 
   DataSource.DataSet.DisableControls;