diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index 4401adcbfe..343b3173d9 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -221,6 +221,7 @@ type
       ItemData: Pointer): Boolean;
     function DoDefaultFilterItem(const ACaption, FilterLC: string;
       const ItemData: Pointer): Boolean; virtual;
+    procedure DestroyWnd; override;
     procedure EditKeyDown(var Key: Word; Shift: TShiftState); override;
     procedure EditChange; override;
     procedure ButtonClick; override;
@@ -1117,6 +1118,12 @@ begin
   Result := (FilterLC='') or (Pos(FilterLC,UTF8LowerCase(ACaption))>0);
 end;
 
+procedure TCustomControlFilterEdit.DestroyWnd;
+begin
+  IdleConnected:=false;
+  inherited DestroyWnd;
+end;
+
 function TCustomControlFilterEdit.DoFilterItem(const ACaption,
   FilterLC: string; ItemData: Pointer): Boolean;
 var