diff --git a/apps/wps.c b/apps/wps.c
index 0313fb7e70..77649801f6 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -945,6 +945,7 @@ int wps_show(void)
             if (id3)
                 wps_refresh(id3,0,false);
         }
-        lastbutton = button;
+        if(button != BUTTON_NONE)
+            lastbutton = button;
     }
 }