Add Enter and ESC handling and focus on edit