diff --git a/.gitignore b/.gitignore
index c20d9b4..9f47830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ node_modules
 Cargo.lock
 
 **/*.gb
+**/*.gbc
 **/*.gbsave
 
 # These are backup files generated by rustfmt
diff --git a/src/screen/tui.rs b/src/screen/tui.rs
index 08f5459..1729f86 100644
--- a/src/screen/tui.rs
+++ b/src/screen/tui.rs
@@ -93,12 +93,16 @@ fn run_app<B: Backend>(
                         app.on_key(c, gameboy);
                     } else if let KeyCode::Up = key.code {
                         gameboy.keydown(KeypadKey::Up);
+                        app.last_key = Some(KeypadKey::Up);
                     } else if let KeyCode::Down = key.code {
                         gameboy.keydown(KeypadKey::Down);
+                        app.last_key = Some(KeypadKey::Down);
                     } else if let KeyCode::Left = key.code {
                         gameboy.keydown(KeypadKey::Left);
+                        app.last_key = Some(KeypadKey::Left);
                     } else if let KeyCode::Right = key.code {
                         gameboy.keydown(KeypadKey::Right);
+                        app.last_key = Some(KeypadKey::Right);
                     }
                 }
             }