diff --git a/components/lazcontrols/listfilteredit.pas b/components/lazcontrols/listfilteredit.pas
index 71215799fb..2119f6bfcf 100644
--- a/components/lazcontrols/listfilteredit.pas
+++ b/components/lazcontrols/listfilteredit.pas
@@ -140,7 +140,9 @@ procedure TListFilterEdit.SetFilteredListbox(const AValue: TCustomListBox);
 begin
   if fFilteredListbox = AValue then Exit;
   fFilteredListbox:=AValue;
-  if Assigned(fFilteredListbox) then begin
+  if Assigned(fFilteredListbox) then
+  begin
+    Filter:=Text;
     fOriginalData.Assign(fFilteredListbox.Items);
     if (fFilteredListbox is TCustomCheckListBox) and not Assigned(fCheckedItems) then
       fCheckedItems:=TStringMap.Create(False);
diff --git a/components/lazcontrols/listviewfilteredit.pas b/components/lazcontrols/listviewfilteredit.pas
index 8f9e34a0ab..70d9016413 100644
--- a/components/lazcontrols/listviewfilteredit.pas
+++ b/components/lazcontrols/listviewfilteredit.pas
@@ -156,8 +156,11 @@ begin
   if fFilteredListview = AValue then Exit;
   fFilteredListview:=AValue;
   if Assigned(fFilteredListview) then
+  begin
+    Filter:=Text;
     for i := 0 to fFilteredListview.Items.Count-1 do
       fOriginalData.Add(ListItem2Data(fFilteredListview.Items[i]));
+  end;
 end;
 
 procedure TListViewFilterEdit.Notification(AComponent: TComponent; Operation: TOperation);