diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index eee8860c9..52715dee2 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -69,10 +69,7 @@ Returns, as a string, the version of the software under which ECL runs."
 ;;
 #-(and mingw32 msvc)
 (si::pathname-translations "SYS" '(("**;*.*" "@ecldir@/**/*.*")))
-#+mingw32
-(si::pathname-translations "SYS"
-  `(("**;*.*" ,(merge-pathnames "**/*.*" (si::argv 0)))))
-#+msvc
+#+(or mingw32 msvc)
 (si::pathname-translations "SYS"
   `(("**;*.*" ,(merge-pathnames "**/*.*" (si::get-library-pathname)))))
 #-msvc
diff --git a/src/lsp/top.lsp b/src/lsp/top.lsp
index 550c7df4f..07cbf8ad6 100644
--- a/src/lsp/top.lsp
+++ b/src/lsp/top.lsp
@@ -386,7 +386,7 @@ value of this variable is non-NIL.")
 	(cond
 	  ((string= "-dir" option)
 	   (setf (logical-pathname-translations "SYS")
-		 `(("SYS:*.*" ,(concatenate 'string (pop-arg "-dir") "*.*")))))
+		 `(("**;*.*" ,(concatenate 'string (pop-arg "-dir") "/**/*.*")))))
 	  ((string= "-compile" option)
 	   (if (nth-value 3
 			  (compile-file