diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 8694a837b0..975a32c768 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -86,12 +86,13 @@ bool remote_button_hold(void) {
 }
 #endif
 
-static int lastbtn;
 void button_event(int key, bool pressed)
 {
     int new_btn = 0;
     int diff = 0;
+    int data = 0;
     static int count = 0;
+    static int lastbtn;
     static int repeat_speed = REPEAT_INTERVAL_START;
     static int repeat_count = 0;
     static bool repeat = false;
@@ -103,7 +104,6 @@ void button_event(int key, bool pressed)
 #endif
 #endif 
     static bool usb_connected = false;
-    int data = 0;
     if (usb_connected && key != SDLK_u)
         return;
     switch (key)
@@ -744,7 +744,7 @@ void button_event(int key, bool pressed)
 #ifdef HAVE_REMOTE_LCD
                         if (btn & BUTTON_REMOTE) {
                             if (!remote_filter_first_keypress || is_remote_backlight_on())
-                                queue_post(&button_queue, btn, data0);
+                                queue_post(&button_queue, btn, data);
                             else
                                 skip_remote_release = true;
                         }