diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
index 020a74f37..76b752ce6 100644
--- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
+++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
@@ -287,7 +287,8 @@ public class DocumentRegion implements CharSequence {
 	 * Create a document region of lenght 0 at the every end of the document.
 	 */
 	public static DocumentRegion endOf(IDocument doc) {
-		return new DocumentRegion(doc, doc.getLength(), doc.getLength());
+		DocumentRegion trimmedDoc = new DocumentRegion(doc).trimEnd();
+		return new DocumentRegion(doc, trimmedDoc.getLength(), doc.getLength());
 	}
 
 }
\ No newline at end of file