diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index 09d921bc5b0..c60af9b95ab 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -19,6 +19,8 @@ import { IRelativePattern } from 'vs/base/common/glob';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { IMessageService } from 'vs/platform/message/common/message';
 import { localize } from 'vs/nls';
+import { getPathLabel } from 'vs/base/common/labels';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -35,7 +37,8 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IFileService private readonly _fileService: IFileService,
 		@IWorkspaceEditingService private _workspaceEditingService: IWorkspaceEditingService,
-		@IMessageService private _messageService: IMessageService
+		@IMessageService private _messageService: IMessageService,
+		@IEnvironmentService private _environmentService: IEnvironmentService
 	) {
 		this._proxy = extHostContext.get(ExtHostContext.ExtHostWorkspace);
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
@@ -84,9 +87,9 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 		return this._messageService.confirm({
 			message: isRemove ?
-				localize('folderMessageRemove', "Extension {0} wants to remove a folder from the workspace. Please confirm.", extensionName) :
-				localize('folderMessageAdd', "Extension {0} wants to add a folder to the workspace. Please confirm.", extensionName),
-			detail: localize('folderPath', "Folder path: '{0}'", uri.scheme === 'file' ? uri.fsPath : uri.toString()),
+				localize('folderMessageRemove', "Extension '{0}' wants to remove a folder from the workspace. Please confirm.", extensionName) :
+				localize('folderMessageAdd', "Extension '{0}' wants to add a folder to the workspace. Please confirm.", extensionName),
+			detail: localize('folderPath', "Folder path: {0}", uri.scheme === 'file' ? getPathLabel(uri.fsPath, null, this._environmentService) : uri.toString()),
 			type: 'question',
 			primaryButton: isRemove ? localize('removeFolder', "&&Remove Folder") : localize('addFolder', "&&Add Folder"),
 			checkbox: {
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
index 62d7532a525..7620583a425 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -945,7 +945,8 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 				checkbox: {
 					label: nls.localize('doNotAskAgain', "Do not ask me again")
 				},
-				type: 'question'
+				type: 'question',
+				primaryButton: nls.localize({ key: 'moveButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Move")
 			});
 		} else {
 			confirmPromise = TPromise.as({ confirmed: true } as IConfirmationResult);