diff --git a/lcl/include/application.inc b/lcl/include/application.inc
index ae36eeacd5..97753e6eef 100644
--- a/lcl/include/application.inc
+++ b/lcl/include/application.inc
@@ -36,7 +36,7 @@ end;
 function GetHintControl(Control: TControl): TControl;
 begin
   Result := Control;
-  while (Result <> nil) and (not Result.ShowHint) do
+  while (Result <> nil) and (not (Result.ShowHint and Result.Enabled)) do
     Result := Result.Parent;
   if (Result <> nil)
   and ([csDesigning,csDestroying,csLoading]*Result.ComponentState<>[]) then
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index cd232fec58..2a1025de9d 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -1210,7 +1210,7 @@ begin
 end;
 
 {------------------------------------------------------------------------------
-  procedure TControl.DoOnShowHint(var HintInfo: THintInfo);
+  procedure TControl.DoOnShowHint(HintInfo: Pointer);
 ------------------------------------------------------------------------------}
 procedure TControl.DoOnShowHint(HintInfo: Pointer);
 begin