diff --git a/apps/action.c b/apps/action.c
index f65736c874..94f27ce2cf 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -111,8 +111,7 @@ int get_action_worker(int context, int timeout,
         {
             ignore_until_release = false;
         }
-        /*last_button = BUTTON_NONE; this is done by action_signalscreenchange() */
-        return ACTION_UNKNOWN; /* "safest" return value */
+        return ACTION_NONE; /* "safest" return value */
     }
 #if (BUTTON_REMOTE != 0)    
     if (soft_unlock_action != ACTION_NONE)
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 2c3d6f7e10..6cb6ddb9aa 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -80,7 +80,8 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
             case ACTION_YESNO_ACCEPT:
                 result=YESNO_YES;
                 break;
-
+            case ACTION_NONE:
+                continue;
             default:
                 if(default_event_handler(button) == SYS_USB_CONNECTED)
                     return(YESNO_USB);
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 1ca4316879..2a6cf038f1 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -84,7 +84,7 @@ const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
     { ACTION_WPSAB_RESET,       BUTTON_ON|BUTTON_SELECT,        BUTTON_ON },
-    { ACTION_WPS_ID3SCREEN,     BUTTON_ON|BUTTON_MODE,          BUTTON_ON },
+    { ACTION_WPS_ID3SCREEN,     BUTTON_ON|BUTTON_MODE,          BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
diff --git a/apps/screens.c b/apps/screens.c
index d65f6ed457..e2e254581a 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -1118,13 +1118,13 @@ bool browse_id3(void)
     gui_synclist_draw(&id3_lists);
     action_signalscreenchange();
     while (true) {
+        gui_syncstatusbar_draw(&statusbars, false);
         key = get_action(CONTEXT_LIST,HZ/2);
         if(key!=ACTION_NONE && key!=ACTION_UNKNOWN && !gui_synclist_do_button(&id3_lists, key))
         {
             action_signalscreenchange();
             return(default_event_handler(key) == SYS_USB_CONNECTED);
         }
-        gui_syncstatusbar_draw(&statusbars, false);
     }
 }