diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc
index 97d6f6f9ef..c0e09b8120 100644
--- a/lcl/include/customedit.inc
+++ b/lcl/include/customedit.inc
@@ -109,6 +109,11 @@ begin
   Result := UTF8Copy(Text, SelStart + 1, SelLength)
 end;
 
+function TCustomEdit.GetTextHint: TTranslateString;
+begin
+  Result := FTextHint;
+end;
+
 procedure TCustomEdit.Loaded;
 begin
   inherited Loaded;
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index 3bd3c95334..9db9c32199 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -716,7 +716,6 @@ type
     FSavedFontStyle: TFontStyles;
     FSavedParentFont: Boolean;
     FSavedPasswordChar: Char;
-    procedure SetTextHint(AValue: TTranslateString);
     procedure ShowTextHint;
     procedure HideTextHint;
     procedure SetAlignment(const AValue: TAlignment);
@@ -745,6 +744,7 @@ type
     function GetSelLength: integer; virtual;
     function GetSelStart: integer; virtual;
     function GetSelText: string; virtual;
+    function GetTextHint: TTranslateString; virtual;
     procedure Loaded; override;
     procedure SetCaretPos(const Value: TPoint); virtual;
     procedure SetEchoMode(Val: TEchoMode); virtual;
@@ -753,6 +753,7 @@ type
     procedure SetSelLength(Val: integer); virtual;
     procedure SetSelStart(Val: integer); virtual;
     procedure SetSelText(const Val: string); virtual;
+    procedure SetTextHint(AValue: TTranslateString); virtual;
     function ChildClassAllowed(ChildClass: TClass): boolean; override;
     class function GetControlClassDefaultSize: TSize; override;
     procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X, Y: Integer); override;
@@ -796,7 +797,7 @@ type
     property TabOrder;
     property TabStop default true;
     property Text;
-    property TextHint: TTranslateString read FTextHint write SetTextHint;
+    property TextHint: TTranslateString read GetTextHint write SetTextHint;
     property TextHintFontColor: TColor read FTextHintFontColor write FTextHintFontColor default clGrayText;
     property TextHintFontStyle: TFontStyles read FTextHintFontStyle write FTextHintFontStyle default [fsItalic];
   end;