diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index 305f98574928a21dfd93253a7ae2707c386f6aab..283492e7f63244d394125090a95db7ddfb3a108a 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -145,8 +145,10 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			if (result) {
 				return this.migrate(result.workspace).then(() => {
 
-					// Show message to user (once)
-					this.informUserOnce(); // TODO@Ben remove me after a couple of releases
+					// Show message to user (once) if entering workspace state
+					if (this.contextService.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
+						this.informUserOnce(); // TODO@Ben remove me after a couple of releases
+					}
 
 					// Reinitialize backup service
 					const backupFileService = this.backupFileService as BackupFileService; // TODO@Ben ugly cast