diff --git a/src/cursor.c b/src/cursor.c
index 62e1821..6957896 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -21,7 +21,7 @@ void cursor_move_up(Cursor* cursor) {
 }
 
 void cursor_move_down(Cursor* cursor) {
-    if (cursor->y == (LINES - 2)) { // Take box lines into account
+    if (cursor->y == (LINES - 5)) { // Take box lines into account
         return;
     }
     cursor->y++;
@@ -35,7 +35,7 @@ void cursor_move_left(Cursor* cursor) {
 }
 
 void cursor_move_right(Cursor* cursor) {
-    if (cursor->x == (COLS - 2)) { // Take box lines into account
+    if (cursor->x == (COLS - 3)) { // Take box lines into account
         return;
     }
     cursor->x++;
diff --git a/src/frontend.c b/src/frontend.c
index dcf4e67..d823478 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -49,7 +49,12 @@ int main(int argc, char *argv[]) {
     char test_msg[] = "Test mode";
     print_status(test_msg, status_win);
 
+
+    // Move cursor to starting location and redraw
+    wmove(canvas_win, cursor_y_to_canvas(cursor), cursor_x_to_canvas(cursor));
     wrefresh(status_win);
+    wrefresh(canvas_win); // Refresh Canvas last so it gets the cursor
+    
 
     //// Main loop
     int last_arrow_direction = KEY_RIGHT;