diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index 404f5a2a78d..8ec38b3795e 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -7,7 +7,7 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as
 import { Registry } from 'vs/platform/registry/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { OperatingSystem } from 'vs/base/common/platform';
+import { OperatingSystem, isWeb } from 'vs/base/common/platform';
 import { Schemas } from 'vs/base/common/network';
 import { IRemoteAgentService, RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -61,7 +61,8 @@ export class LabelContribution implements IWorkbenchContribution {
 						label: '${path}',
 						separator: remoteEnvironment.os === OperatingSystem.Windows ? '\\' : '/',
 						tildify: remoteEnvironment.os !== OperatingSystem.Windows,
-						normalizeDriveLetter: remoteEnvironment.os === OperatingSystem.Windows
+						normalizeDriveLetter: remoteEnvironment.os === OperatingSystem.Windows,
+						workspaceSuffix: isWeb ? undefined : Schemas.vscodeRemote
 					}
 				});
 			}
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 4f138914750..a5934abc85d 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -17,7 +17,6 @@ import { isWindows } from 'vs/base/common/platform';
 import { tildify, getPathLabel } from 'vs/base/common/labels';
 import { ltrim, endsWith } from 'vs/base/common/strings';
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-import { Schemas } from 'vs/base/common/network';
 import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting } from 'vs/platform/label/common/label';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from 'vs/base/common/glob';
@@ -283,12 +282,8 @@ export class LabelService implements ILabelService {
 	}
 
 	private appendWorkspaceSuffix(label: string, uri: URI): string {
-		if (uri.scheme === Schemas.file) {
-			return label;
-		}
-
 		const formatting = this.findFormatting(uri);
-		const suffix = formatting && (typeof formatting.workspaceSuffix === 'string') ? formatting.workspaceSuffix : uri.scheme;
+		const suffix = formatting && (typeof formatting.workspaceSuffix === 'string') ? formatting.workspaceSuffix : undefined;
 		return suffix ? `${label} [${suffix}]` : label;
 	}
 }