Index: apps/gui/list.c
===================================================================
--- apps/gui/list.c	(revision 12648)
+++ apps/gui/list.c	(working copy)
@@ -229,7 +229,8 @@
     int lines;
 #ifdef HAVE_LCD_BITMAP
     int item_offset;
-    int old_margin = display->getxmargin();
+    int old_xmargin = display->getxmargin();
+    int old_ymargin = display->getymargin();
 #endif
 
     gui_textarea_clear(display);
@@ -406,7 +407,9 @@
                            gui_list->start_item,
                            gui_list->start_item + lines, VERTICAL);
     }
-    screen_set_xmargin(display, old_margin);
+
+    screen_set_xmargin(display, old_xmargin);
+    screen_set_ymargin(display, old_ymargin);
 #endif
 
     gui_textarea_update(display);
Index: apps/plugins/solitaire.c
===================================================================
--- apps/plugins/solitaire.c	(revision 12648)
+++ apps/plugins/solitaire.c	(working copy)
@@ -646,7 +646,6 @@
                 break;
 
             case 3:
-                rb->lcd_setmargins(0, 0);
                 if (solitaire_help() == HELP_USB)
                     result = MENU_USB;
                 break;
@@ -657,7 +656,6 @@
         }
     }
     rb->menu_exit(m);
-    rb->lcd_setmargins(0, 0);
     return result;
 }
 
Index: apps/plugins/viewer.c
===================================================================
--- apps/plugins/viewer.c	(revision 12648)
+++ apps/plugins/viewer.c	(working copy)
@@ -1287,8 +1287,6 @@
     result = rb->menu_run(m);
     rb->menu_exit(m);
 #ifdef HAVE_LCD_BITMAP
-    rb->lcd_setmargins(0,0);
-
     /* Show-scrollbar mode for current view-width mode */
     if (!ONE_SCREEN_FITS_ALL())
         if (prefs.scrollbar_mode == true)
@@ -1328,9 +1326,6 @@
             break;
     }
     rb->menu_exit(m);
-#ifdef HAVE_LCD_BITMAP
-    rb->lcd_setmargins(0,0);
-#endif
     viewer_draw(col);
 }