diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index 09e05baa4f..77d0bd0046 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -435,6 +435,7 @@ type
     procedure SetUseFormActivate(AValue: Boolean);
     procedure FormActivate(Sender: TObject); // Connects to owning form.
     procedure FormDeactivate(Sender: TObject);
+    function IsTextHintStored: Boolean;
   protected
     fNeedUpdate: Boolean;
     fIsFirstUpdate: Boolean;
@@ -535,7 +536,7 @@ type
     property OnStartDrag;
     property OnUTF8KeyPress;
     property Text;
-    property TextHint;
+    property TextHint stored IsTextHintStored;
     property TextHintFontColor;
     property TextHintFontStyle;
   end;
@@ -2233,6 +2234,11 @@ begin
   IdleConnected:=true;
 end;
 
+function TCustomControlFilterEdit.IsTextHintStored: Boolean;
+begin
+  Result := TextHint <> rsFilter;
+end;
+
 procedure TCustomControlFilterEdit.ResetFilter;
 begin
   Filter := '';