diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index 261dc966699888b98bf2db67cad5f855ecf0a15c..c3b3bb22264c28592c901f44d9e3c4b3b902586a 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -156,12 +156,12 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 
 				// File path
 				if (typeof folder === 'string') {
-					return { path: folder } as IRawFileWorkspaceFolder;
+					return { path: massageFolderPathForWorkspace(folder, untitledWorkspaceConfigFolder, []) } as IRawFileWorkspaceFolder;
 				}
 
 				// File URI
 				else if (folder.scheme === 'file') {
-					return { path: folder.fsPath } as IRawFileWorkspaceFolder;
+					return { path: massageFolderPathForWorkspace(folder.fsPath, untitledWorkspaceConfigFolder, []) } as IRawFileWorkspaceFolder;
 				}
 
 				// Any URI