diff --git a/src/core/Buffer.cc b/src/core/Buffer.cc
index 9ad941b..0d8f694 100644
--- a/src/core/Buffer.cc
+++ b/src/core/Buffer.cc
@@ -6,9 +6,10 @@
 
 Buffer::Buffer()
 {
+    piece_table = std::make_shared<PieceTable>(nullptr, 0u);
     m_file_buffer = nullptr;
     m_file_buffer_size = 0u;
-    piece_table = std::make_shared<PieceTable>(nullptr, 0u);
+    m_eol_at_eof = true;
 }
 
 Buffer::~Buffer()
@@ -56,6 +57,8 @@ bool Buffer::load_from_file(const char * filename)
         piece_table->append_initial_line_piece(it->first, it->second, it->second);
     }
 
+    m_eol_at_eof = text_loader.get_eol_at_eof();
+
     return true;
 }
 
diff --git a/src/core/Buffer.h b/src/core/Buffer.h
index 970ca6c..b79980e 100644
--- a/src/core/Buffer.h
+++ b/src/core/Buffer.h
@@ -17,6 +17,7 @@ public:
 protected:
     uint8_t * m_file_buffer;
     unsigned long m_file_buffer_size;
+    bool m_eol_at_eof;
 
     void free_file_buffer();
 };