diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index a26cef11e4..9e3b25ba39 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -3458,7 +3458,7 @@ begin
   
   Result.Desc:=CurExprDesc;
   Result.Context:=CurContext;
-  if Result.Desc=xtContext then
+  if (Result.Desc=xtContext) and (not (fdfFindVariable in StartFlags)) then
     Result:=Result.Context.Tool.ConvertNodeToExpressionType(Result.Context.Node,
                                                             Params);
   {$IFDEF ShowExprEval}