1 files changed, 2 insertions, 1 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 78ab8dc8dd..b42e386a91 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -839,7 +839,8 @@ long gui_wps_show(void)
                 if (global_settings.shortcuts_replaces_qs)
                 {
                     global_status.last_screen = GO_TO_SHORTCUTMENU;
-                    return quick_screen_quick(button);
+                    int ret = quick_screen_quick(button);
+                    return (ret == GO_TO_PREVIOUS ? GO_TO_WPS : ret);
                 }
                 else if (quick_screen_quick(button) > 0)
                     return GO_TO_ROOT;