diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 01a75df39a..7ff75537aa 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -1918,6 +1918,7 @@ int solitaire( int skipmenu )
         }
 
 #ifdef NEED_LASTBUTTON_VAR
+        if( button != BUTTON_NONE )
             lastbutton = button;
 #endif