diff --git a/src/gui/BufferPane.cc b/src/gui/BufferPane.cc
index bbd6e3e..84a3c32 100644
--- a/src/gui/BufferPane.cc
+++ b/src/gui/BufferPane.cc
@@ -295,7 +295,10 @@ void BufferPane::handle_key(uint32_t keyval)
         if (keyval == '\033')
         {
             m_buffer->exit_insert_mode();
-            /* TODO: move cursor to last character in row if it was on EOL */
+            if (!m_iterator->is_start_of_line())
+            {
+                m_iterator->go_back();
+            }
         }
         else if (keyval <= 0xFFu)
         {