diff --git a/src/core/Buffer.cc b/src/core/Buffer.cc
index 741516f..f0fb65e 100644
--- a/src/core/Buffer.cc
+++ b/src/core/Buffer.cc
@@ -70,6 +70,7 @@ bool Buffer::load_from_file(const char * filename)
     }
 
     load_text_in_buffer(buffer, buffer_size, file_size);
+    m_filename = filename;
 
     return true;
 }
diff --git a/src/core/Buffer.h b/src/core/Buffer.h
index 6dfdee6..74d7513 100644
--- a/src/core/Buffer.h
+++ b/src/core/Buffer.h
@@ -6,6 +6,7 @@
 #include "LineEndings.h"
 #include "Encoding.h"
 #include "GapBuffer.h"
+#include <string>
 
 class Buffer
 {
@@ -107,6 +108,7 @@ public:
     bool insert_mode() const { return m_insert_mode; }
     void insert_code_point(uint32_t code_point, bool adjust_iterators = true);
     void erase_code_point(const Buffer::Iterator & position);
+    std::string filename() const { return m_filename; }
 
 protected:
     bool m_eol_at_eof;
@@ -117,6 +119,7 @@ protected:
     bool m_insert_mode;
     size_t m_insert_position;
     std::list<std::shared_ptr<Iterator>> m_iterators;
+    std::string m_filename;
 
     void common_initialization();
     bool load_from_file(const char * filename);