diff --git a/ide/codehelp.pas b/ide/codehelp.pas
index 5644571b49..f87993a0f4 100644
--- a/ide/codehelp.pas
+++ b/ide/codehelp.pas
@@ -1559,9 +1559,13 @@ begin
   end;
 
   // check if in the doc path of the project
-  if (AProject<>nil) and (AProject.LazDocPaths<>'') then begin
+  if (AProject<>nil) and (AProject.LazDocPaths<>'')
+  and FilenameIsAbsolute(AProject.ProjectInfoFile) then begin
     Path:=ExtractFilePath(FPDocFile.Filename);
     SearchPath:=AProject.LazDocPaths;
+    IDEMacros.CreateAbsoluteSearchPath(SearchPath,
+                                     ExtractFilePath(AProject.ProjectInfoFile));
+    SearchPath:=TrimSearchPath(SearchPath,'');
     p:=FindPathInSearchPath(PChar(Path),length(Path),
                             PChar(SearchPath),length(SearchPath));
     if p<>nil then begin
diff --git a/ide/fpdocselectlink.pas b/ide/fpdocselectlink.pas
index ce39e6df10..cbbdfa5083 100644
--- a/ide/fpdocselectlink.pas
+++ b/ide/fpdocselectlink.pas
@@ -360,6 +360,7 @@ var
   AProject: TLazProject;
   APackage: TLazPackage;
 begin
+  DebugLn(['TFPDocLinkEditorDlg.AddModuleUnits ',DbgSName(ModuleOwner)]);
   if ModuleOwner=nil then exit;
   if ModuleOwner is TLazProject then begin
     AProject:=TLazProject(ModuleOwner);
@@ -378,12 +379,14 @@ var
   ProjFile: TLazProjectFile;
   Identifier: String;
 begin
+  DebugLn(['TFPDocLinkEditorDlg.AddProjectUnits ']);
   for i:=0 to AProject.FileCount-1 do begin
     ProjFile:=AProject.Files[i];
     if ProjFile.IsPartOfProject then begin
       Filename:=ProjFile.Filename;
       if FilenameIsPascalUnit(Filename) then begin
         Filename:=ExtractFileNameOnly(Filename);
+        DebugLn(['TFPDocLinkEditorDlg.AddProjectUnits ',Prefix,' ',Filename]);
         if (CompareFilenames(Prefix,copy(Filename,1,length(Prefix)))=0) then
         begin
           Identifier:=ExtractFileNameOnly(ProjFile.Filename);