diff --git a/main/fpga_download.c b/main/fpga_download.c
index 8b47df6..d21e9d1 100644
--- a/main/fpga_download.c
+++ b/main/fpga_download.c
@@ -56,7 +56,7 @@ bool fpga_uart_load(uint8_t* buffer, uint32_t length) {
     return fpga_read_stdin(buffer, length, 3000);
 }
 
-void fpga_download(ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341) {
+void fpga_download(xQueueHandle buttonQueue, ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341) {
     char message[64];
 
     pax_noclip(pax_buffer);
@@ -93,7 +93,6 @@ void fpga_download(ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341) {
         
         uint8_t* buffer = malloc(length);
         if (buffer == NULL) {
-            free(buffer);
             pax_noclip(pax_buffer);
             pax_background(pax_buffer, 0xa85a32);
             pax_draw_text(pax_buffer, 0xFFFFFFFF, NULL, 18, 0, 20*0, "FPGA download mode");
@@ -141,13 +140,7 @@ void fpga_download(ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341) {
         esp_err_t res = ice40_load_bitstream(ice40, buffer, length);
         free(buffer);
         
-        if (res == ESP_OK) {
-            while (!fpga_uart_sync(&length, &crc)) {
-                vTaskDelay(2 / portTICK_PERIOD_MS);
-            }
-            ice40_disable(ice40);
-            ili9341_init(ili9341);
-        } else {
+        if (res != ESP_OK) {
             ice40_disable(ice40);
             ili9341_init(ili9341);
             pax_noclip(pax_buffer);
@@ -159,5 +152,72 @@ void fpga_download(ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341) {
             fpga_uninstall_uart();
             return;
         }
+
+        // Waiting for next download and sending key strokes to FPGA
+        uint16_t key_state = 0;
+        while (!fpga_uart_sync(&length, &crc)) {
+            rp2040_input_message_t buttonMessage = {0};
+            if (xQueueReceive(buttonQueue, &buttonMessage, 0) == pdTRUE) {
+                uint8_t pin = buttonMessage.input;
+                bool value = buttonMessage.state;
+                uint16_t key_mask = 0;
+                switch(pin) {
+                    case RP2040_INPUT_JOYSTICK_DOWN:
+                        key_mask = 1 << 0;
+                        break;
+                    case RP2040_INPUT_JOYSTICK_UP:
+                        key_mask = 1 << 1;
+                        break;
+                    case RP2040_INPUT_JOYSTICK_LEFT:
+                        key_mask = 1 << 2;
+                        break;
+                    case RP2040_INPUT_JOYSTICK_RIGHT:
+                        key_mask = 1 << 3;
+                        break;
+                    case RP2040_INPUT_JOYSTICK_PRESS:
+                        key_mask = 1 << 4;
+                        break;
+                    case RP2040_INPUT_BUTTON_HOME:
+                        key_mask = 1 << 5;
+                        break;
+                    case RP2040_INPUT_BUTTON_MENU:
+                        key_mask = 1 << 6;
+                        break;
+                    case RP2040_INPUT_BUTTON_SELECT:
+                        key_mask = 1 << 7;
+                        break;
+                    case RP2040_INPUT_BUTTON_START:
+                        key_mask = 1 << 8;
+                        break;
+                    case RP2040_INPUT_BUTTON_ACCEPT:
+                        key_mask = 1 << 9;
+                        break;
+                    case RP2040_INPUT_BUTTON_BACK:
+                        key_mask = 1 << 10;
+                    default:
+                        break;
+                }
+                if (key_mask != 0)
+                {
+                    if (value) {
+                        key_state |= key_mask;
+                    }
+                    else {
+                        key_state &= ~key_mask;
+                    }
+                    uint8_t message[5] = { 0xf5 };
+                    message[1] = key_state & 0xff;
+                    message[2] = key_state >> 8;
+                    message[3] = key_mask & 0xff;
+                    message[4] = key_mask >> 8;
+                    res = ice40_send(ice40, message, 5);
+                }
+            }
+            else {
+                vTaskDelay(2 / portTICK_PERIOD_MS);
+            }
+        }
+        ice40_disable(ice40);
+        ili9341_init(ili9341);
     }
 }
diff --git a/main/include/fpga_download.h b/main/include/fpga_download.h
index c313993..a10f8f0 100644
--- a/main/include/fpga_download.h
+++ b/main/include/fpga_download.h
@@ -3,5 +3,6 @@
 #include "ice40.h"
 #include "pax_gfx.h"
 #include "ili9341.h"
+#include <freertos/FreeRTOS.h>
 
-void fpga_download(ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341);
+void fpga_download(xQueueHandle buttonQueue, ICE40* ice40, pax_buf_t* pax_buffer, ILI9341* ili9341);
diff --git a/main/main.c b/main/main.c
index 7e1b9cb..8ae349a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -811,7 +811,7 @@ void app_main(void) {
             graphics_task(pax_buffer, ili9341, NULL, "Loading...");
             fpga_test(ili9341, ice40, rp2040->queue);
         } else if (menu_action == ACTION_FPGA_DL) {
-            fpga_download(ice40, pax_buffer, ili9341);
+            fpga_download(rp2040->queue, ice40, pax_buffer, ili9341);
         } else if (menu_action == ACTION_RP2040_BL) {
             graphics_task(pax_buffer, ili9341, NULL, "RP2040 update...");
             rp2040_reboot_to_bootloader(rp2040);