diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index fc0fa389b29..edf0384f2db 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -306,16 +306,16 @@ void PathChooser::setEnvironment(const Environment &env)
     }
 }
 
-QString PathChooser::path() const
-{
-    return d->expandedPath(rawPath());
-}
-
 QString PathChooser::rawPath() const
 {
     return rawFileName().toString();
 }
 
+QString PathChooser::path() const
+{
+    return fileName().toString();
+}
+
 FileName PathChooser::rawFileName() const
 {
     return FileName::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text()));
@@ -323,7 +323,7 @@ FileName PathChooser::rawFileName() const
 
 FileName PathChooser::fileName() const
 {
-    return FileName::fromString(path());
+    return FileName::fromUserInput(d->expandedPath(rawFileName().toString()));
 }
 
 // FIXME: try to remove again