diff --git a/lcl/forms.pp b/lcl/forms.pp
index b0f90e8eba..72d17c8611 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -1033,7 +1033,7 @@ type
     procedure SetFlags(const AValue: TApplicationFlags);
     procedure SetNavigation(const AValue: TApplicationNavigationOptions);
     procedure UpdateMouseControl(NewMouseControl: TControl);
-    procedure MouseIdle(const CurrentControl: TControl);
+    procedure UpdateMouseHint(CurrentControl: TControl);
     procedure SetCaptureExceptions(const AValue: boolean);
     procedure SetHint(const AValue: string);
     procedure SetHintColor(const AValue: TColor);
@@ -1163,7 +1163,9 @@ type
     procedure DoReturnKey(AControl: TWinControl; var Key: Word;
                           Shift: TShiftState);
     procedure DoTabKey(AControl: TWinControl; var Key: Word;Shift: TShiftState);
+
     property Active: boolean read GetActive;
+    property ApplicationType : TApplicationType read FApplicationType write FApplicationType;
     property BidiMode: TBiDiMode read FBidiMode write SetBidiMode;
     property CaptureExceptions: boolean read FCaptureExceptions
                                         write SetCaptureExceptions;
@@ -1181,6 +1183,7 @@ type
     property Icon: TIcon read FIcon write SetIcon;
     property Navigation: TApplicationNavigationOptions read FNavigation write SetNavigation;
     property MainForm: TForm read FMainForm;
+    property MouseControl: TControl read FMouseControl;
     property OnActionExecute: TActionEvent read FOnActionExecute write FOnActionExecute;
     property OnActionUpdate: TActionEvent read FOnActionUpdate write FOnActionUpdate;
     property OnActivate: TNotifyEvent read FOnActivate write FOnActivate;
@@ -1201,7 +1204,6 @@ type
     property ShowHint: Boolean read FShowHint write SetShowHint;
     property ShowMainForm: Boolean read FShowMainForm write FShowMainForm default true;
     property Title: String read GetTitle write SetTitle;
-    property ApplicationType : TApplicationType read FApplicationType write FApplicationType;
   end;
 
   { TApplicationProperties }
diff --git a/lcl/include/application.inc b/lcl/include/application.inc
index 2772fac6ca..b9c7988a7e 100644
--- a/lcl/include/application.inc
+++ b/lcl/include/application.inc
@@ -318,7 +318,7 @@ var
   Done: Boolean;
 begin
   ProcessAsyncCallQueue;
-  MouseIdle(GetControlAtMouse);
+  UpdateMouseHint(GetControlAtMouse);
 
   Done := True;
   if (FIdleLockCount=0) then begin
@@ -375,16 +375,21 @@ begin
 end;
 
 {------------------------------------------------------------------------------
-  Method: TApplication.MouseIdle
+  Method: TApplication.UpdateMouseHint
   Params: None
   Returns:  Nothing
 
   Handles mouse Idle
  ------------------------------------------------------------------------------}
-procedure TApplication.MouseIdle(const CurrentControl: TControl);
+procedure TApplication.UpdateMouseHint(CurrentControl: TControl);
+var
+  HintControl: TControl;
 begin
-  if FMouseControl <> CurrentControl then
-    UpdateMouseControl(CurrentControl);
+  HintControl := GetHintControl(CurrentControl);
+  if HintControl = nil then
+    Hint := ''
+  else
+    Hint := GetLongHint(HintControl.Hint);
 end;
 
 procedure TApplication.SetCaptureExceptions(const AValue: boolean);
@@ -495,8 +500,6 @@ end;
 
  ------------------------------------------------------------------------------}
 procedure TApplication.UpdateMouseControl(NewMouseControl: TControl);
-var
-  HintControl: TControl;
 begin
   //debugln(['TApplication.UpdateMouseControl Old=',DbgSName(FMouseControl),' New=',DbgSName(NewMouseControl)]);
   if FMouseControl = NewMouseControl then
@@ -508,11 +511,7 @@ begin
   end;
   FMouseControl := NewMouseControl;
 
-  HintControl := GetHintControl(FMouseControl);
-  if HintControl = nil then
-    Application.Hint := ''
-  else
-    Application.Hint := GetLongHint(HintControl.Hint);
+  Application.UpdateMouseHint(FMouseControl);
 
   if (FMouseControl <> nil) then
   begin