diff --git a/source/qb64pe.bas b/source/qb64pe.bas
index 51ee9d547..b6785a9d5 100644
--- a/source/qb64pe.bas
+++ b/source/qb64pe.bas
@@ -4481,11 +4481,14 @@ DO
                                         sfheader = 1
                                         GOTO GotHeader
                                     END IF
+
                                     ' a740g: Fallback to source path
                                     IF inclevel > 0 THEN
                                         libpath$ = getfilepath(incname(inclevel)) + og_libpath$
+                                    ELSEIF NoIDEMode THEN
+                                        libpath$ = FixDirectoryName(path.source$) + og_libpath$
                                     ELSE
-                                        libpath$ = FixDirectoryName(idepath$) + og_libpath$
+                                        IF LEN(ideprogname) THEN libpath$ = idepath$ + pathsep$ + og_libpath$
                                     END IF
                                     libpath_inline$ = GetEscapedPath(libpath$)
                                     IF _FILEEXISTS(libpath$ + x$ + ".h") THEN
@@ -4555,8 +4558,10 @@ DO
                                     ' a740g: Fallback to source path
                                     IF inclevel > 0 THEN
                                         libpath$ = getfilepath(incname(inclevel)) + og_libpath$
+                                    ELSEIF NoIDEMode THEN
+                                        libpath$ = FixDirectoryName(path.source$) + og_libpath$
                                     ELSE
-                                        libpath$ = FixDirectoryName(idepath$) + og_libpath$
+                                        IF LEN(ideprogname) THEN libpath$ = idepath$ + pathsep$ + og_libpath$
                                     END IF
                                     libpath_inline$ = GetEscapedPath(libpath$)
                                     IF _FILEEXISTS(libpath$ + x$ + ".h") THEN