diff --git a/components/lazcontrols/listfilteredit.pas b/components/lazcontrols/listfilteredit.pas
index 0a053679f5..0f188e5f3e 100644
--- a/components/lazcontrols/listfilteredit.pas
+++ b/components/lazcontrols/listfilteredit.pas
@@ -140,6 +140,12 @@ end;
 procedure TListFilterEdit.SetFilteredListbox(const AValue: TCustomListBox);
 begin
   if fFilteredListbox = AValue then Exit;
+  if Assigned(fFilteredListbox) then
+  begin
+    fFilteredListbox.RemoveFreeNotification(Self);
+    InternalSetFilter('');
+    ApplyFilter(True);
+  end;
   fFilteredListbox:=AValue;
   if Assigned(fFilteredListbox) then
   begin
@@ -147,6 +153,7 @@ begin
     fOriginalData.Assign(fFilteredListbox.Items);
     if (fFilteredListbox is TCustomCheckListBox) and not Assigned(fCheckedItems) then
       fCheckedItems:=TStringMap.Create(False);
+    fFilteredListbox.FreeNotification(Self);
   end;
 end;
 
diff --git a/components/lazcontrols/listviewfilteredit.pas b/components/lazcontrols/listviewfilteredit.pas
index 2b2b10a2bc..7fdf5b03f8 100644
--- a/components/lazcontrols/listviewfilteredit.pas
+++ b/components/lazcontrols/listviewfilteredit.pas
@@ -151,12 +151,19 @@ var
   i: Integer;
 begin
   if fFilteredListview = AValue then Exit;
-  fFilteredListview:=AValue;
+  if Assigned(fFilteredListview) then
+  begin
+    fFilteredListview.RemoveFreeNotification(Self);
+    InternalSetFilter('');
+    ApplyFilter(True);
+  end;
+  fFilteredListview := AValue;
   if Assigned(fFilteredListview) then
   begin
     InternalSetFilter(Text);
     for i := 0 to fFilteredListview.Items.Count-1 do
       fOriginalData.Add(ListItem2Data(fFilteredListview.Items[i]));
+    fFilteredListview.FreeNotification(Self);
   end;
 end;
 
diff --git a/components/lazcontrols/treefilteredit.pas b/components/lazcontrols/treefilteredit.pas
index da9cea5d4c..6747a29dcc 100644
--- a/components/lazcontrols/treefilteredit.pas
+++ b/components/lazcontrols/treefilteredit.pas
@@ -729,11 +729,13 @@ begin
   begin
     fFilteredTreeview.RemoveFreeNotification(Self);
     fFilteredTreeview.RemoveHandlerOnBeforeDestruction(@OnBeforeTreeDestroy);
+    InternalSetFilter('');
+    ApplyFilter(True);
   end;
   fFilteredTreeview := AValue;
   if fFilteredTreeview <> nil then
   begin
-    InvalidateFilter;
+    InternalSetFilter(Text);
     fFilteredTreeview.FreeNotification(Self);
     fFilteredTreeview.AddHandlerOnBeforeDestruction(@OnBeforeTreeDestroy);
   end;
diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index 68e6df6c7c..9bb9c76c2a 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -121,7 +121,6 @@ type
     property OnButtonClick: TNotifyEvent read GetOnButtonClick write SetOnButtonClick;
   public
     constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
   end;
 
  { TEditButton }
@@ -233,7 +232,6 @@ type
     fSortData: Boolean;             // Data needs to be sorted.
     fIsFirstSetFormActivate: Boolean;
     fOnAfterFilter: TNotifyEvent;
-    procedure ApplyFilter(Immediately: Boolean = False);
     procedure SetFilter(AValue: string);
     procedure SetFilterOptions(AValue: TFilterStringOptions);
     procedure SetSortData(AValue: Boolean);
@@ -259,6 +257,7 @@ type
     procedure BuddyClick; override;
     procedure SortAndFilter; virtual; abstract;
     procedure ApplyFilterCore; virtual; abstract;
+    procedure ApplyFilter(Immediately: Boolean = False);
     procedure MoveNext(ASelect: Boolean = False); virtual; abstract;
     procedure MovePrev(ASelect: Boolean = False); virtual; abstract;
     procedure MovePageUp(ASelect: Boolean = False); virtual; abstract;
@@ -1170,18 +1169,13 @@ begin
   Spacing := 4;
 end;
 
-destructor TCustomEditButton.Destroy;
-begin
-  inherited Destroy;
-end;
-
 
 { TCustomControlFilterEdit }
 
 constructor TCustomControlFilterEdit.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
-  ControlStyle := ControlStyle - [csSetCaption];
+  ControlStyle:=ControlStyle-[csSetCaption];
   CharCase:=ecLowerCase;
   Button.Enabled:=False;
   fFilterOptions:=[];
@@ -1192,7 +1186,7 @@ end;
 
 destructor TCustomControlFilterEdit.Destroy;
 begin
-  IdleConnected := False;
+  IdleConnected:=False;
   inherited Destroy;
 end;
 
@@ -1204,7 +1198,6 @@ end;
 
 procedure TCustomControlFilterEdit.InternalSetFilter(const AValue: string);
 begin
-  if fFilter=AValue then Exit;
   Button.Enabled:=AValue<>'';
   fFilter:=AValue;
   fFilterLowercase:=UTF8LowerCase(fFilter);
@@ -1215,7 +1208,7 @@ procedure TCustomControlFilterEdit.SetFilter(AValue: string);
 // AValue parameter must not have const modifier. It causes a crash, see issue #40300.
 begin
   if Text=AValue then Exit;
-  Text:=AValue;           // ActivateFilter will be called by EditChange handler.
+  Text:=AValue;           // ApplyFilter will be called by EditChange handler.
   InternalSetFilter(AValue);
 end;