diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index 6dd4609f3a..c5e08a3241 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -1489,7 +1489,10 @@ begin
       GetIdentStartEndAtPosition(Src,CleanCursorPos,
                                  CurPos.StartPos,CurPos.EndPos);
       CursorAtIdentifier:=CurPos.StartPos<CurPos.EndPos;
-      IdentifierStart:=@Src[CurPos.StartPos];
+      if CursorAtIdentifier then
+        IdentifierStart:=@Src[CurPos.StartPos]
+      else
+        IdentifierStart:=PChar(Src);
     end;
     if CursorAtIdentifier then begin
       // find declaration of identifier