diff --git a/apps/gui/list.c b/apps/gui/list.c
index 5d5733b4e9..286e6f9e59 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -228,6 +228,7 @@ static void gui_list_draw(struct gui_list * gui_list)
     int lines;
 #ifdef HAVE_LCD_BITMAP
     int item_offset;
+    int old_margin = display->getxmargin();
 #endif
 
     gui_textarea_clear(display);
@@ -401,6 +402,7 @@ static void gui_list_draw(struct gui_list * gui_list)
                            gui_list->start_item,
                            gui_list->start_item + lines, VERTICAL);
     }
+    screen_set_xmargin(display, old_margin);
 #endif
 
     gui_textarea_update(display);
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 6cb6ddb9aa..d05ea6654a 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -26,9 +26,7 @@ void gui_yesno_draw(struct gui_yesno * yn)
 {
     struct screen * display=yn->display;
     int nb_lines, line_shift=0;
-#ifdef HAS_LCD_BITMAP
-    screen_set_xmargin(display, 0);
-#endif
+
     gui_textarea_clear(display);
     nb_lines=yn->main_message->nb_lines;