3 files changed, 5 insertions, 4 deletions

diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 1f5e8706f9..71a28cb520 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -510,7 +510,7 @@ bool option_screen(const struct settings_list *setting,
     gui_synclist_speak_item(&lists);
     while (!done)
     {
-        if (list_do_action(CONTEXT_LIST, TIMEOUT_BLOCK,
+        if (list_do_action(CONTEXT_LIST, HZ, /* HZ so the status bar redraws */
                            &lists, &action,
             allow_wrap? LIST_WRAP_UNLESS_HELD: LIST_WRAP_OFF))
         {
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 8bdecef692..d4a4c0e828 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -128,9 +128,9 @@ void sb_skin_update(enum screen_type screen, bool force)
                 skin_update(&sb_skin[i], force?
                         WPS_REFRESH_ALL : WPS_REFRESH_NON_STATIC);
         }
+        next_update = current_tick + update_delay; /* don't update too often */
+        sb_skin[SCREEN_MAIN].sync_data->do_full_update = false;
     }
-    next_update = current_tick + update_delay; /* don't update too often */
-    sb_skin[SCREEN_MAIN].sync_data->do_full_update = false;
 }
 
 void do_sbs_update_callback(void *param)
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 159e5b6913..6e8491d110 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -153,7 +153,8 @@ static void toggle_theme(void)
         remove_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, do_sbs_update_callback);
         remove_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw);
     }
-        
+    /* let list initialize viewport in case viewport dimensions is changed. */
+    send_event(GUI_EVENT_THEME_CHANGED, NULL);
     FOR_NB_SCREENS(i)
         was_enabled[i] = is_theme_enabled(i);
 }