diff --git a/src/sql/workbench/contrib/editData/browser/editDataInput.ts b/src/sql/workbench/contrib/editData/browser/editDataInput.ts
index dd1a5754e7..14d11d3eac 100644
--- a/src/sql/workbench/contrib/editData/browser/editDataInput.ts
+++ b/src/sql/workbench/contrib/editData/browser/editDataInput.ts
@@ -91,7 +91,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 	// Getters/Setters
 	public get tableName(): string { return this._tableName; }
 	public get schemaName(): string { return this._schemaName; }
-	public get uri(): string { return this._uri.toString(); }
+	public get uri(): string { return unescape(this._uri.toString()); }
 	public get sql(): UntitledTextEditorInput { return this._sql; }
 	public get results(): EditDataResultsInput { return this._results; }
 	public getResultsInputResource(): string { return this._results.uri; }
diff --git a/src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts b/src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts
index 367bbfd7b9..346bc00003 100644
--- a/src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts
+++ b/src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts
@@ -100,6 +100,6 @@ export class EditDataResultsInput extends EditorInput {
 	}
 
 	get uri(): string {
-		return this._uri;
+		return unescape(this._uri);
 	}
-}
\ No newline at end of file
+}