diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index aec3a1401d..5a7ed471ed 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -68,7 +68,7 @@ bool keys_locked = false;
 static void wps_state_update_ctp(const char *path);
 
 #ifdef HAVE_LCD_BITMAP
-static void gui_wps_set_margine(struct gui_wps *gwps)
+static void gui_wps_set_margin(struct gui_wps *gwps)
 {
     int offset = 0;
     struct wps_data *data = gwps->data;
@@ -100,7 +100,7 @@ long gui_wps_show(void)
 #else
     FOR_NB_SCREENS(i)
     {
-        gui_wps_set_margine(&gui_wps[i]);
+        gui_wps_set_margin(&gui_wps[i]);
     }
 #endif
 
@@ -229,7 +229,7 @@ long gui_wps_show(void)
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
                 {
-                    gui_wps_set_margine(&gui_wps[i]);
+                    gui_wps_set_margin(&gui_wps[i]);
                 }
 #endif
                 restore = true;
@@ -485,7 +485,7 @@ long gui_wps_show(void)
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
                 {
-                    gui_wps_set_margine(&gui_wps[i]);
+                    gui_wps_set_margin(&gui_wps[i]);
                 }
 #endif
                 restore = true;
@@ -511,6 +511,12 @@ long gui_wps_show(void)
 #endif
                 if (quick_screen_quick(button))
                     return SYS_USB_CONNECTED;
+#ifdef HAVE_LCD_BITMAP
+                FOR_NB_SCREENS(i)
+                {
+                    gui_wps_set_margin(&gui_wps[i]);
+                }
+#endif
                 restore = true;
                 lastbutton = 0;
                 break;
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index a036e88cd7..ecf496241d 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -160,6 +160,7 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
      *    then release the enter button*/
     bool can_quit=false;
     gui_syncquickscreen_draw(qs);
+    gui_syncstatusbar_draw(&statusbars, true);
     while (true) {
         raw_key = button_get(true);
         button=uncombine_button(raw_key, button_enter);