diff --git a/src/extension.ts b/src/extension.ts
index c1ef01f78..fda0a7749 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -807,10 +807,11 @@ export async function activate(context: vscode.ExtensionContext) {
 
   registerIDFCommand("espIdf.selectCurrentIdfVersion", () => {
     PreCheck.perform([webIdeCheck, openFolderCheck], async () => {
-      const curWorkspaceFolder = vscode.workspace.workspaceFolders.find(
-        (w) => w.uri === workspaceRoot
-      );
-      await selectIdfSetup(curWorkspaceFolder);
+      const currentIdfSetup = await selectIdfSetup(workspaceRoot);
+      if (currentIdfSetup) {
+        statusBarItems["currentIdfVersion"].text =
+          "$(octoface) ESP-IDF v" + currentIdfSetup.version;
+      }
     });
   });
 
diff --git a/src/versionSwitcher/index.ts b/src/versionSwitcher/index.ts
index 35d32b417..70e2016c0 100644
--- a/src/versionSwitcher/index.ts
+++ b/src/versionSwitcher/index.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { ConfigurationTarget, Uri, window, WorkspaceFolder } from "vscode";
+import { ConfigurationTarget, Uri, window } from "vscode";
 import { getPreviousIdfSetups } from "../setup/existingIdfSetups";
 import {
   checkIdfSetup,
@@ -27,7 +27,7 @@ import { getIdfMd5sum } from "../setup/espIdfJson";
 import { getEspIdfFromCMake } from "../utils";
 import { IdfSetup } from "../views/setup/types";
 
-export async function selectIdfSetup(workspaceFolder: WorkspaceFolder) {
+export async function selectIdfSetup(workspaceFolder: Uri) {
   const idfSetups = await getPreviousIdfSetups(true);
   if (idfSetups.length === 0) {
     await window.showInformationMessage("No ESP-IDF Setups found");
@@ -50,8 +50,10 @@ export async function selectIdfSetup(workspaceFolder: WorkspaceFolder) {
   }
   await useIdfSetupSettings(
     selectedIdfSetupOption.target,
-    ConfigurationTarget.WorkspaceFolder
+    ConfigurationTarget.WorkspaceFolder,
+    workspaceFolder
   );
+  return selectedIdfSetupOption.target;
 }
 
 export async function getCurrentIdfSetup(workspaceFolder: Uri) {