diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index f06ea5baf1..62514869e3 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -567,6 +567,11 @@ long gui_wps_show(void)
                 update_track = true;
                 break;
 
+            case SYS_POWEROFF:
+                bookmark_autobookmark();
+                default_event_handler(SYS_POWEROFF);
+                break;
+                
             default:
                 if(default_event_handler(button) == SYS_USB_CONNECTED)
                     return SYS_USB_CONNECTED;