diff --git a/kernel.c b/kernel.c
index 1ab188bc1700eb6a6abf421d12da5627924fe065..b3bca4fe7d9266e2253d9c0e8b8e52e483cb47ca 100644
--- a/kernel.c
+++ b/kernel.c
@@ -85,36 +85,32 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y) {
 }
 
 void terminal_putchar(char c) {
-  if (c == '\n') {
-    terminal_column = 0;
-    if (++terminal_row == VGA_HEIGHT) {
-      for (size_t y = 1; y < VGA_HEIGHT; y++) {
-        for (size_t x = 0; x < VGA_WIDTH; x++) {
-          terminal_buffer[(y - 1) * VGA_WIDTH + x] = terminal_buffer[y * VGA_WIDTH + x];
+    if (c == '\n') {
+        terminal_column = 0;
+        if (++terminal_row == VGA_HEIGHT) {
+            terminal_row = 0;
         }
-      }
-      for (size_t x = 0; x < VGA_WIDTH; x++) {
-        terminal_buffer[(VGA_HEIGHT - 1) * VGA_WIDTH + x] = make_vgaentry(' ', terminal_color);
-      }
-      terminal_row = VGA_HEIGHT - 1;
-    }
-  } else {
-    terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
-    if (++terminal_column == VGA_WIDTH) {
-      terminal_column = 0;
-      if (++terminal_row == VGA_HEIGHT) {
-        for (size_t y = 1; y < VGA_HEIGHT; y++) {
-          for (size_t x = 0; x < VGA_WIDTH; x++) {
-            terminal_buffer[(y - 1) * VGA_WIDTH + x] = terminal_buffer[y * VGA_WIDTH + x];
-          }
-        }
-        for (size_t x = 0; x < VGA_WIDTH; x++) {
-          terminal_buffer[(VGA_HEIGHT - 1) * VGA_WIDTH + x] = make_vgaentry(' ', terminal_color);
+    } else if (c == '\r') {
+        terminal_column = 0;
+    } else {
+        terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
+        if (++terminal_column == VGA_WIDTH) {
+            terminal_column = 0;
+            if (++terminal_row == VGA_HEIGHT) {
+                terminal_row = 0;
+                // Scroll the screen up one row
+                for (size_t i = 1; i < VGA_HEIGHT; i++) {
+                    for (size_t j = 0; j < VGA_WIDTH; j++) {
+                        terminal_buffer[(i - 1) * VGA_WIDTH + j] = terminal_buffer[i * VGA_WIDTH + j];
+                    }
+                }
+                // Clear the last row
+                for (size_t x = 0; x < VGA_WIDTH; x++) {
+                    terminal_buffer[(VGA_HEIGHT - 1) * VGA_WIDTH + x] = make_vgaentry(' ', terminal_color);
+                }
+            }
         }
-        terminal_row = VGA_HEIGHT - 1;
-      }
     }
-  }
 }
 
 void terminal_writestring(const char* data) {