1 files changed, 8 insertions, 8 deletions

diff --git a/apps/screens.c b/apps/screens.c
index b7e4575534..401fe3d28a 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -525,10 +525,6 @@ bool quick_screen_quick(int button_enter)
     struct option_select right_option;
     int oldrepeat, old_x_margin, old_y_margin;
 
-    old_x_margin = lcd_getxmargin();
-    old_y_margin = lcd_getymargin();
-    lcd_setmargins(0, 0);
-
     static const struct opt_items left_items[] = {
         [0]={ STR(LANG_OFF) },
         [1]={ STR(LANG_ON) }
@@ -551,6 +547,10 @@ bool quick_screen_quick(int button_enter)
     };
     struct gui_quickscreen qs;
 
+    old_x_margin = lcd_getxmargin();
+    old_y_margin = lcd_getymargin();
+    lcd_setmargins(0, 0);
+
     option_select_init_items(&left_option,
                              (char *)str(LANG_SHUFFLE),
                              bool_to_int(global_settings.playlist_shuffle),
@@ -615,10 +615,6 @@ bool quick_screen_f3(int button_enter)
     struct option_select right_option;
     int old_x_margin, old_y_margin;
 
-    old_x_margin = lcd_getxmargin();
-    old_y_margin = lcd_getymargin();
-    lcd_setmargins(0, 0);
-
     static const struct opt_items onoff_items[] = {
         [0]={ STR(LANG_OFF) },
         [1]={ STR(LANG_ON) }
@@ -630,6 +626,10 @@ bool quick_screen_f3(int button_enter)
 
     struct gui_quickscreen qs;
 
+    old_x_margin = lcd_getxmargin();
+    old_y_margin = lcd_getymargin();
+    lcd_setmargins(0, 0);
+
     option_select_init_items(&left_option,
                              str(LANG_SCROLL_BAR),
                              bool_to_int(global_settings.scrollbar),