diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 70954ff4214..764feb0d08b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2108,8 +2108,8 @@ bool GitClient::synchronousApplyPatch(const FilePath &workingDirectory,
 Environment GitClient::processEnvironment() const
 {
     Environment environment = VcsBaseClientImpl::processEnvironment();
-    const QString gitPath = settings().path.value();
-    environment.prependOrSetPath(FilePath::fromUserInput(gitPath));
+    const FilePath gitPath = settings().path();
+    environment.prependOrSetPath(gitPath);
     if (HostOsInfo::isWindowsHost() && settings().winSetHomeEnvironment.value()) {
         QString homePath;
         if (qtcEnvironmentVariableIsEmpty("HOMESHARE")) {
@@ -2457,7 +2457,7 @@ void GitClient::tryLaunchingGitK(const Environment &env,
 
     // This should always use Process::startDetached (as not to kill
     // the child), but that does not have an environment parameter.
-    if (!settings().path.value().isEmpty()) {
+    if (!settings().path().isEmpty()) {
         auto process = new Process(const_cast<GitClient*>(this));
         process->setWorkingDirectory(workingDirectory);
         process->setEnvironment(env);
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index 4ef786c5354..6c4bd4a480e 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -161,7 +161,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
     if (tryResolve) {
         resolvedBinPath = binaryPath();
         if (!resolvedBinPath.isAbsolutePath())
-            resolvedBinPath = resolvedBinPath.searchInPath({path.filePath()}, FilePath::PrependToPath);
+            resolvedBinPath = resolvedBinPath.searchInPath({path()}, FilePath::PrependToPath);
         tryResolve = false;
     }
 
@@ -170,7 +170,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
             *ok = false;
         if (errorMessage)
             *errorMessage = Tr::tr("The binary \"%1\" could not be located in the path \"%2\"")
-                .arg(binaryPath.value(), path.value());
+                .arg(binaryPath.value(), path().toUserOutput());
     }
     return resolvedBinPath;
 }
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h
index 6e1f227f218..77aa9770b0f 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.h
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.h
@@ -20,7 +20,7 @@ public:
     Utils::StringAspect userEmail{this};
     Utils::IntegerAspect logCount{this};
     Utils::IntegerAspect timeout{this}; // Seconds
-    Utils::StringAspect path{this};
+    Utils::FilePathAspect path{this};
 
     Utils::FilePaths searchPathList() const;
 };