diff --git a/src/gui/BufferPane.cc b/src/gui/BufferPane.cc
index 84a3c32..77512a1 100644
--- a/src/gui/BufferPane.cc
+++ b/src/gui/BufferPane.cc
@@ -317,7 +317,10 @@ void BufferPane::handle_key(uint32_t keyval)
             cursor_move(CursorMovement::EOL);
             break;
         case 'a':
-            m_iterator->go_forward();
+            if (**m_iterator != '\n')
+            {
+                m_iterator->go_forward();
+            }
             m_buffer->enter_insert_mode(*m_iterator);
             m_window->request_redraw();
             break;