diff --git a/src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts b/src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
index 976a53e00b99ff908cd7ca02c37d1135e9ed4b6a..cd5d3299937774c86402938968c87d80ec1ee931 100644
--- a/src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
@@ -200,7 +200,8 @@ export class RemoteFileDialog {
 			this.autoCompletePathSegment = '';
 
 			this.filePickBox.title = this.options.title;
-			this.filePickBox.value = this.pathFromUri(this.currentFolder);
+			this.filePickBox.value = this.pathFromUri(this.currentFolder, true);
+			this.filePickBox.valueSelection = [this.filePickBox.value.length, this.filePickBox.value.length];
 			this.filePickBox.items = [];
 
 			function doResolve(dialog: RemoteFileDialog, uri: URI | undefined) {
@@ -593,8 +594,10 @@ export class RemoteFileDialog {
 			if (this.allowFolderSelection) {
 				this.filePickBox.activeItems = [];
 			}
-			this.filePickBox.valueSelection = [0, this.filePickBox.value.length];
-			this.insertText(newValue, newValue);
+			if (!equalsIgnoreCase(this.filePickBox.value, newValue)) {
+				this.filePickBox.valueSelection = [0, this.filePickBox.value.length];
+				this.insertText(newValue, newValue);
+			}
 			this.filePickBox.busy = false;
 		});
 	}