diff --git a/TextEditor.cpp b/TextEditor.cpp
index 0f906fe..1e02a70 100644
--- a/TextEditor.cpp
+++ b/TextEditor.cpp
@@ -104,9 +104,7 @@
 		{
 			istart = 0;
 			++lstart;
-
-			if (lstart < lend)
-				result += '\n';
+			result += '\n';
 		}
 	}
 
@@ -2105,7 +2103,9 @@
 
 std::string TextEditor::GetText() const
 {
-	return GetText(Coordinates(), Coordinates((int)mLines.size(), 0));
+	auto lastLine = (int)mLines.size() - 1;
+	auto lastLineLength = GetLineMaxColumn(lastLine);
+	return GetText(Coordinates(), Coordinates(lastLine, lastLineLength));
 }
 
 std::vector<std::string> TextEditor::GetTextLines() const