diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index 2151522f83..6be01fe6bc 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -1792,7 +1792,7 @@ end;
 procedure TCustomControlFilterEdit.FormActivate(Sender: TObject);
 begin
   fJustActivated:=fParentForm.ActiveControl=Self.FEdit;
-  if fParentForm.ActiveControl=Self.FEdit then
+  if fJustActivated then
     Filter:=Text;
 end;