diff --git a/src/app.zig b/src/app.zig
index 9460957..6f920a6 100644
--- a/src/app.zig
+++ b/src/app.zig
@@ -443,43 +443,49 @@ pub fn App(comptime M: type, comptime E: type) type {
                             },
                         }
                     } else {
-                        const b = buf[0];
-                        const key: Key = switch (b) {
-                            0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } },
-                            0x08 => .{ .cp = input.Backspace },
-                            0x09 => .{ .cp = input.Tab },
-                            0x0a => .{ .cp = 'j', .mod = .{ .ctrl = true } },
-                            0x0d => .{ .cp = input.Enter },
-                            0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } },
-                            0x1b => escape: {
-                                assert(read_bytes == 1);
-                                break :escape .{ .cp = input.Escape };
-                            },
-                            0x7f => .{ .cp = input.Backspace },
-                            else => {
-                                var len = read_bytes;
-                                while (!std.unicode.utf8ValidateSlice(buf[0..len])) len -= 1;
-                                remaining_bytes = read_bytes - len;
-
-                                if (this.config.rawMode) {
+                        if (this.config.rawMode) {
+                            const b = buf[0];
+                            const key: Key = switch (b) {
+                                0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } },
+                                0x08 => .{ .cp = input.Backspace },
+                                0x09 => .{ .cp = input.Tab },
+                                0x0a => .{ .cp = 'j', .mod = .{ .ctrl = true } },
+                                0x0d => .{ .cp = input.Enter },
+                                0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } },
+                                0x1b => escape: {
+                                    assert(read_bytes == 1);
+                                    break :escape .{ .cp = input.Escape };
+                                },
+                                0x7f => .{ .cp = input.Backspace },
+                                else => {
+                                    var len = read_bytes;
+                                    while (!std.unicode.utf8ValidateSlice(buf[0..len])) len -= 1;
+                                    remaining_bytes = read_bytes - len;
                                     var iter: std.unicode.Utf8Iterator = .{ .bytes = buf[0..len], .i = 0 };
                                     while (iter.nextCodepoint()) |cp| this.postEvent(.{ .key = .{ .cp = cp } });
-                                } else try lines.appendSlice(this.gpa, buf[0..len]);
-
-                                if (remaining_bytes > 0) {
-                                    @memmove(buf[0..remaining_bytes], buf[len .. len + remaining_bytes]);
-                                } else {
-                                    if (read_bytes != 512 and buf[len - 1] == '\n') this.postEvent(.{ .line = try lines.toOwnedSlice(this.gpa) });
-                                    // NOTE line did not end with `\n` but with EOF, meaning the user canceled
-                                    if (read_bytes != 512 and buf[len - 1] != '\n') {
-                                        lines.clearRetainingCapacity();
-                                        this.postEvent(.cancel);
+                                    if (remaining_bytes > 0) {
+                                        @memmove(buf[0..remaining_bytes], buf[len .. len + remaining_bytes]);
                                     }
+                                    continue; // this switch block does not return a `Key` we continue with loop
+                                },
+                            };
+                            this.postEvent(.{ .key = key });
+                        } else {
+                            var len = read_bytes;
+                            while (!std.unicode.utf8ValidateSlice(buf[0..len])) len -= 1;
+                            remaining_bytes = read_bytes - len;
+                            try lines.appendSlice(this.gpa, buf[0..len]);
+                            if (remaining_bytes > 0) {
+                                @memmove(buf[0..remaining_bytes], buf[len .. len + remaining_bytes]);
+                            } else {
+                                if (read_bytes != 512 and buf[len - 1] == '\n') this.postEvent(.{ .line = try lines.toOwnedSlice(this.gpa) });
+                                // NOTE line did not end with `\n` but with EOF, meaning the user canceled
+                                if (read_bytes != 512 and buf[len - 1] != '\n') {
+                                    lines.clearRetainingCapacity();
+                                    this.postEvent(.cancel);
                                 }
-                                continue; // this switch block does not return a `Key` we continue with loop
-                            },
-                        };
-                        this.postEvent(.{ .key = key });
+                            }
+                        }
                     }
                     continue;
                 };