diff --git a/apps/misc.c b/apps/misc.c
index 72457cd..70b9f89 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -875,6 +875,7 @@ void system_sound_play(enum system_sound sound)
 /* Produce keyclick based upon button and global settings */
 void keyclick_click(int button)
 {
+    static long last_button = BUTTON_NONE;
     /* Settings filters */
     if (global_settings.keyclick &&
         (global_settings.keyclick_repeats || !(button & BUTTON_REPEAT)))
@@ -883,8 +884,23 @@ void keyclick_click(int button)
         if (button != BUTTON_NONE && !(button & BUTTON_REL)
             && !(button & (SYS_EVENT|BUTTON_MULTIMEDIA)) )
         {
-            system_sound_play(SOUND_KEYCLICK);
+#ifdef HAVE_SCROLLWHEEL
+            if (last_button & (BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD))
+                system_sound_play(SOUND_KEYCLICK);
+            else
+#endif
+            if ((button & BUTTON_REPEAT) && (last_button == BUTTON_NONE))
+            {
+                last_button = button;
+                system_sound_play(SOUND_KEYCLICK);
+            )
+            else
+            {
+                last_button = button;
+            }
         }
+        else
+            last_button = BUTTON_NONE;
     }
 }
 #endif /* CONFIG_CODEC == SWCODEC */