diff --git a/apps/action.c b/apps/action.c
index 856bc0810c..eae00f5d18 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -224,9 +224,7 @@ static int get_action_worker(int context, int timeout,
     static struct timeout gui_unboost;
     /* Boost the CPU in case of wheel scrolling activity in the defined contexts. 
      * Call unboost with a timeout of GUI_BOOST_TIMEOUT. */
-    if ((button&(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD)) && 
-        (context == CONTEXT_STD      || context == CONTEXT_LIST ||
-         context == CONTEXT_MAINMENU || context == CONTEXT_TREE))
+    if (button != BUTTON_NONE)
     {
         gui_boost(true);
         timeout_register(&gui_unboost, gui_unboost_callback, GUI_BOOST_TIMEOUT, 0);
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index e9ebf02f85..6b84faabd4 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -97,6 +97,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
+#define HAVE_GUI_BOOST
+
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
 /* There is no hardware tone control */
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index d163d116cf..5f6d195810 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -93,6 +93,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
+#define HAVE_GUI_BOOST
+
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
 /* There is no hardware tone control */
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 1f6307865a..b028dadb75 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -92,6 +92,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
+#define HAVE_GUI_BOOST
+
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
 /* There is no hardware tone control */