diff --git a/es-core/src/components/primary/TextListComponent.h b/es-core/src/components/primary/TextListComponent.h
index 3db5a3d67..5431d5792 100644
--- a/es-core/src/components/primary/TextListComponent.h
+++ b/es-core/src/components/primary/TextListComponent.h
@@ -95,10 +95,12 @@ private:
     void onScroll() override
     {
         if (mGamelistView &&
-            !NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
+            (!isScrolling() ||
+             !NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND)))
             NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
         else if (!mGamelistView &&
-                 !NavigationSounds::getInstance().isPlayingThemeNavigationSound(SYSTEMBROWSESOUND))
+                 (!isScrolling() || !NavigationSounds::getInstance().isPlayingThemeNavigationSound(
+                                        SYSTEMBROWSESOUND)))
             NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND);
     }
     void onCursorChanged(const CursorState& state) override;