1 files changed, 9 insertions, 6 deletions

diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 4b9a3e3752..e5d95495fa 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -32,6 +32,7 @@
 #include "tree.h"
 #include "onplay.h"
 #include "talk.h"
+#include "misc.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "widgets.h"
@@ -1045,15 +1046,17 @@ bool playlist_viewer_ex(char* filename)
                 update = true;
                 break;
 
-            case SYS_USB_CONNECTED:
-                usb_screen();
-                ret = true;
-                goto exit;
-                break;
-
             case BUTTON_NONE:
                 status_draw(false);
                 break;
+
+            default:
+                if(default_event_handler(button) == SYS_USB_CONNECTED)
+                {
+                    ret = true;
+                    goto exit;
+                }
+                break;
         }
 
         if (update && !exit)