:: commit 1fa24b49c52e70c35db9a6eb121a0ddf6e5e18d6

diff --git a/limine-pxe.bin b/limine-pxe.bin
index 9dbe8e5d..07f13648 100644
Binary files a/limine-pxe.bin and b/limine-pxe.bin differ
diff --git a/limine.bin b/limine.bin
index a9526f86..080f2ec7 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2.map b/stage2.map
index cb6678ae..f437b261 100644
Binary files a/stage2.map and b/stage2.map differ
diff --git a/stage2/lib/term.c b/stage2/lib/term.c
index 911b46ec..ab049516 100644
--- a/stage2/lib/term.c
+++ b/stage2/lib/term.c
@@ -152,6 +152,10 @@ static void escape_parse(uint8_t c) {
     }
 
     switch (c) {
+        case 0x1b:
+            escape = 0;
+            raw_putchar(0x1b);
+            return;
         case '[':
             return;
         case ';':
diff --git a/stage2/menu.c b/stage2/menu.c
index 0c976933..b3aabb8e 100644
--- a/stage2/menu.c
+++ b/stage2/menu.c
@@ -70,10 +70,11 @@ static size_t get_prev_line(size_t index, const char *buffer) {
 }
 
 static char *config_entry_editor(const char *orig_entry) {
-    size_t cursor_offset = 0;
-    size_t entry_size    = strlen(orig_entry);
-    size_t window_size   = term_rows - 11;
-    size_t window_offset = 0;
+    size_t cursor_offset  = 0;
+    size_t entry_size     = strlen(orig_entry);
+    size_t _window_size   = term_rows - 11;
+    size_t window_offset  = 0;
+    size_t line_size      = term_cols - 2;
 
     // Skip leading newlines
     while (*orig_entry == '\n') {
@@ -112,7 +113,7 @@ refresh:
     print("\xbf\xb3");
 
     int cursor_x, cursor_y;
-    size_t current_line = 0;
+    size_t current_line = 0, line_offset = 0, window_size = _window_size;
     bool printed_cursor = false;
     for (size_t i = 0; ; i++) {
         if (buffer[i] == '\n'
@@ -130,10 +131,19 @@ refresh:
                 print("\xb3\xc0");
             else
                 print("\xb3\xb3");
+            line_offset = 0;
             current_line++;
             continue;
         }
 
+        if (line_offset && !(line_offset % line_size)) {
+            window_size--;
+            if (current_line == window_offset + window_size)
+                print("\x1a\xc0");
+            else
+                print("\x1a\x1b\x1b");
+        }
+
         if (i == cursor_offset
          && current_line <  window_offset + window_size
          && current_line >= window_offset) {
@@ -156,12 +166,15 @@ refresh:
         }
 
         if (buffer[i] == '\n') {
+            line_offset = 0;
             current_line++;
             continue;
         }
 
-        if (current_line >= window_offset)
+        if (current_line >= window_offset) {
+            line_offset++;
             print("%c", buffer[i]);
+        }
     }
 
     if (current_line - window_offset < window_size) {