diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index aeaceb2780..6f6a8c1f7f 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -203,11 +203,12 @@ void list_draw(struct screen *display, struct gui_synclist *list)
                 vp.x += list_text_vp->width;
             else /* left */
                 list_text_vp->x += SCROLLBAR_WIDTH;
-            display->set_viewport(&vp);
+            struct viewport *last = display->set_viewport(&vp);
             gui_scrollbar_draw(display,
                     (scrollbar_in_left? 0: 1), 0, SCROLLBAR_WIDTH-1, vp.height,
                     list->nb_items, list_start_item, list_start_item + nb_lines,
                     VERTICAL);
+            display->set_viewport(last);
         }
         /* shift everything a bit in relation to the title */
         else if (!VP_IS_RTL(list_text_vp) && scrollbar_in_left)