diff --git a/src/sql/workbench/common/customInputConverter.ts b/src/sql/workbench/common/customInputConverter.ts
index 17bb8bd7d4..f8b7e24c29 100644
--- a/src/sql/workbench/common/customInputConverter.ts
+++ b/src/sql/workbench/common/customInputConverter.ts
@@ -43,7 +43,7 @@ export function convertEditorInput(input: EditorInput, options: IQueryEditorOpti
 			//QueryInput
 			uri = getQueryEditorFileUri(input);
 			if (uri) {
-				const queryResultsInput: QueryResultsInput = instantiationService.createInstance(QueryResultsInput, uri.toString());
+				const queryResultsInput: QueryResultsInput = instantiationService.createInstance(QueryResultsInput, uri.toString(true));
 				let queryInput: QueryInput = instantiationService.createInstance(QueryInput, '', input, queryResultsInput, undefined);
 				return queryInput;
 			}
diff --git a/src/sql/workbench/parts/query/common/queryInput.ts b/src/sql/workbench/parts/query/common/queryInput.ts
index 3a85d67cd4..b9c8d75dfd 100644
--- a/src/sql/workbench/parts/query/common/queryInput.ts
+++ b/src/sql/workbench/parts/query/common/queryInput.ts
@@ -194,7 +194,7 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 	}
 
 	// Getters for private properties
-	public get uri(): string { return this.getResource().toString(); }
+	public get uri(): string { return this.getResource().toString(true); }
 	public get sql(): UntitledEditorInput { return this._sql; }
 	public get results(): QueryResultsInput { return this._results; }
 	public updateSelection(selection: ISelectionData): void { this._updateSelection.fire(selection); }