diff --git a/protocols/ssh/src/terminal_handlers.c b/protocols/ssh/src/terminal_handlers.c
index 255f6743..a2f91cb2 100644
--- a/protocols/ssh/src/terminal_handlers.c
+++ b/protocols/ssh/src/terminal_handlers.c
@@ -104,8 +104,8 @@ int guac_terminal_echo(guac_terminal* term, char c) {
 
         /* Line feed / VT / FF */
         case '\n':
-        case '0x0B': /* VT */
-        case '0x0C': /* FF */
+        case 0x0B: /* VT */
+        case 0x0C: /* FF */
             term->cursor_row++;
 
             /* Scroll up if necessary */
@@ -124,6 +124,15 @@ int guac_terminal_echo(guac_terminal* term, char c) {
             term->char_handler = guac_terminal_escape; 
             break;
 
+        /* CSI */
+        case 0x9B:
+            term->char_handler = guac_terminal_csi; 
+            break;
+
+        /* DEL (ignored) */
+        case 0x7F:
+            break;
+
         /* Displayable chars */
         default: