diff --git a/src/core/config/CustomModesManager.ts b/src/core/config/CustomModesManager.ts
index a9a2e6a6b55a..aeb91fefb20e 100644
--- a/src/core/config/CustomModesManager.ts
+++ b/src/core/config/CustomModesManager.ts
@@ -13,7 +13,7 @@ import { getWorkspacePath } from "../../utils/path"
 import { getGlobalRooDirectory } from "../../services/roo-config"
 import { logger } from "../../utils/logging"
 import { GlobalFileNames } from "../../shared/globalFileNames"
-import { ensureSettingsDirectoryExists } from "../../utils/globalContext"
+import { getSettingsDirectoryPath } from "../../utils/storage"
 import { t } from "../../i18n"
 
 const ROOMODES_FILENAME = ".roomodes"
@@ -246,7 +246,7 @@ export class CustomModesManager {
 	}
 
 	public async getCustomModesFilePath(): Promise<string> {
-		const settingsDir = await ensureSettingsDirectoryExists(this.context)
+		const settingsDir = await getSettingsDirectoryPath(this.context.globalStorageUri.fsPath)
 		const filePath = path.join(settingsDir, GlobalFileNames.customModes)
 		const fileExists = await fileExistsAtPath(filePath)
 
diff --git a/src/utils/globalContext.ts b/src/utils/globalContext.ts
index 882501850d5e..8e00595e8686 100644
--- a/src/utils/globalContext.ts
+++ b/src/utils/globalContext.ts
@@ -1,13 +1,10 @@
-import { mkdir } from "fs/promises"
-import { join } from "path"
 import { ExtensionContext } from "vscode"
+import { getStorageBasePath, getSettingsDirectoryPath } from "./storage"
 
 export async function getGlobalFsPath(context: ExtensionContext): Promise<string> {
-	return context.globalStorageUri.fsPath
+	return getStorageBasePath(context.globalStorageUri.fsPath)
 }
 
 export async function ensureSettingsDirectoryExists(context: ExtensionContext): Promise<string> {
-	const settingsDir = join(context.globalStorageUri.fsPath, "settings")
-	await mkdir(settingsDir, { recursive: true })
-	return settingsDir
+	return getSettingsDirectoryPath(context.globalStorageUri.fsPath)
 }