diff --git a/lcl/grids.pas b/lcl/grids.pas
index 82aa863e0e..d9621187d5 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -3962,9 +3962,13 @@ begin
       begin
         AddToHint(txt, txt1);
         AddToHint(txt, txt2);
-        if txt <> '' then begin
-          txt := GetShortHint(FSavedHint) + LineEnding + txt;
-          AppHint := GetLongHint(FSavedHint) + LineEnding + txt;
+        if (txt <> '') then begin
+          if FSavedHint = '' then
+            AppHint := txt
+          else begin
+            txt := GetShortHint(FSavedHint) + LineEnding + txt;
+            AppHint := GetLongHint(FSavedHint) + LineEnding + txt;
+          end;
         end else
         begin
           txt := GetShortHint(FSavedHint);