diff --git a/src/gui/BufferPane.cc b/src/gui/BufferPane.cc
index f7172da..306b6c1 100644
--- a/src/gui/BufferPane.cc
+++ b/src/gui/BufferPane.cc
@@ -234,7 +234,15 @@ int BufferPane::draw_buffer_line(int screen_row, const Buffer::Iterator & start_
                 saved_row_offset = row_offset;
                 if ((code_point != '\t') && (code_point != ' '))
                 {
-                    m_window->gl()->draw_character(win_x(x), win_y(y), code_point, *m_window->font());
+                    if (code_point < 0x20u)
+                    {
+                        m_window->gl()->draw_character(win_x(x), win_y(y), '^', *m_window->font());
+                        m_window->gl()->draw_character(win_x(col_x(screen_column + 1)), win_y(y), code_point | 0x40u, *m_window->font());
+                    }
+                    else
+                    {
+                        m_window->gl()->draw_character(win_x(x), win_y(y), code_point, *m_window->font());
+                    }
                 }
             }
         }