diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 912baec403..92c3d5d9c7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1911,11 +1911,12 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
+				if (contains(docdir, '~'))
+					docdir = subst(docdir, "~", "\\string~");
 				bool const nonascii = !isAscii(from_utf8(docdir));
 				// LaTeX 2019/10/01 handles non-ascii path without detokenize
 				bool const utfpathlatex = features.isAvailable("LaTeX-2019/10/01");
-				bool const detokenize = !utfpathlatex
-						&& (nonascii || contains(docdir, '~'));
+				bool const detokenize = !utfpathlatex && nonascii;
 				bool const quote = contains(docdir, ' ');
 				if (utfpathlatex && nonascii)
 					os << "\\UseRawInputEncoding\n";
diff --git a/status.23x b/status.23x
index 5cb8a2b4e4..6780f0332f 100644
--- a/status.23x
+++ b/status.23x
@@ -44,6 +44,9 @@ What's new
 - Fix problems with non-ASCII characters in file path with recent LaTeX
   (bug 11146).
 
+- Fix problems with recent LaTeX when \input@path contains tilde and space
+  (bug 11699).
+
 
 * USER INTERFACE