1 files changed, 13 insertions, 3 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 1cb9472e0f..c4c22641ca 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -365,6 +365,7 @@ static void button_tick(void)
     static int repeat_speed = REPEAT_INTERVAL_START;
     static int repeat_count = 0;
     static bool repeat = false;
+    static bool post = false;
     int diff;
     int btn;
 
@@ -381,7 +382,6 @@ static void button_tick(void)
     /* only poll every X ticks */
     if ( ++tick >= POLL_FREQUENCY )
     {
-        bool post = false;
         btn = button_read();
 
         /* Find out if a key has been released */
@@ -406,7 +406,8 @@ static void button_tick(void)
                 {
                     if ( repeat )
                     {
-                        count--;
+                        if (!post)
+                            count--;
                         if (count == 0) {
                             post = true;
                             /* yes we have repeat */
@@ -458,9 +459,18 @@ static void button_tick(void)
                 if ( post )
                 {
                     if (repeat)
-                        queue_post(&button_queue, BUTTON_REPEAT | btn, NULL);
+                    {
+                        if (queue_empty(&button_queue))
+                        {
+                            queue_post(&button_queue, BUTTON_REPEAT | btn, NULL);
+                            post = false;
+                        }
+                    }
                     else
+                    {
                         queue_post(&button_queue, btn, NULL);
+                        post = false;
+                    }
 #ifdef HAVE_REMOTE_LCD
                     if(btn & BUTTON_REMOTE)
                         remote_backlight_on();