diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 885cdea9f8f..e916a5a8341 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -197,10 +197,9 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
     m_useStaging->setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBoxWithoutDummyLabel);
     m_useStaging->setDefaultValue(!buildAndRunOnSameDevice(kit()));
 
-    m_stagingDir = addAspect<StringAspect>();
+    m_stagingDir = addAspect<FilePathAspect>();
     m_stagingDir->setSettingsKey(STAGING_DIR_KEY);
     m_stagingDir->setLabelText(Tr::tr("Staging directory:"));
-    m_stagingDir->setDisplayStyle(StringAspect::PathChooserDisplay);
     m_stagingDir->setDefaultValue(initialStagingDir());
 
     Kit *kit = buildConfiguration()->kit();
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 973b00e8f37..85ee46d953b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -108,7 +108,7 @@ private:
     Utils::StringAspect *m_toolArguments = nullptr;
     Utils::BoolAspect *m_useiOSAutomaticProvisioningUpdates = nullptr;
     Utils::BoolAspect *m_useStaging = nullptr;
-    Utils::StringAspect *m_stagingDir = nullptr;
+    Utils::FilePathAspect *m_stagingDir = nullptr;
 
     QString m_allTarget = "all";
     QString m_installTarget = "install";