diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
index 71b3703a..4ae6c5e5 100644
--- a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
+++ b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
@@ -158,7 +158,8 @@ protected String generateCsv(Object[][] data) {
                     result.append(this.currentSeparator);
                 }
             }
-            if (CsvEditorSettingsExternalizable.getInstance().isFileEndLineBreak() || row < data.length - 1) {
+            if (row < data.length - 1 ||
+                    (CsvEditorSettingsExternalizable.getInstance().isFileEndLineBreak() && getColumnInfoMap().hasEmptyLastLine())) {
                 result.append("\n");
             }
         }