diff --git a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
index d4a3b582ad9..fe2194d334d 100644
--- a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
@@ -121,7 +121,11 @@ export class FinalNewLineParticipant implements INamedSaveParticpant {
 			prevSelection = editor.getSelections();
 		}
 
-		model.pushEditOperations(prevSelection, [EditOperation.insert(new Position(lineCount + 1, 0), model.getEOL())], (edits) => prevSelection);
+		model.pushEditOperations(prevSelection, [EditOperation.insert(new Position(lineCount, model.getLineMaxColumn(lineCount)), model.getEOL())], edits => prevSelection);
+
+		if (editor) {
+			editor.setSelections(prevSelection);
+		}
 	}
 }