1 files changed, 6 insertions, 1 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 846c952baf..78ab8dc8dd 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -836,7 +836,12 @@ long gui_wps_show(void)
             case ACTION_WPS_QUICKSCREEN:
             {
                 gwps_leave_wps();
-                if (quick_screen_quick(button))
+                if (global_settings.shortcuts_replaces_qs)
+                {
+                    global_status.last_screen = GO_TO_SHORTCUTMENU;
+                    return quick_screen_quick(button);
+                }
+                else if (quick_screen_quick(button) > 0)
                     return GO_TO_ROOT;
                 restore = true;
             }