diff --git a/src/gui/Window.cc b/src/gui/Window.cc
index ec0068f..3bb3d84 100644
--- a/src/gui/Window.cc
+++ b/src/gui/Window.cc
@@ -144,6 +144,7 @@ bool Window::create(std::shared_ptr<Buffer> buffer)
     glVertexAttribPointer(0, 2, GL_INT, GL_FALSE, 0, 0);
 
     m_buffer = buffer;
+    m_cursor = buffer->add_cursor();
     m_cursor_row = 0;
     m_scroll_offset = 5;
     m_target_column = 0u; /* TODO: fix */
diff --git a/src/gui/Window.h b/src/gui/Window.h
index 6790a51..ecf5a0e 100644
--- a/src/gui/Window.h
+++ b/src/gui/Window.h
@@ -72,6 +72,7 @@ protected:
     uint32_t m_target_column;
 
     std::shared_ptr<Buffer> m_buffer;
+    std::shared_ptr<GapBuffer::Cursor> m_cursor;
 
     std::shared_ptr<glcxx::Array> m_cursor_array;
     std::shared_ptr<glcxx::Buffer> m_cursor_buffer;