diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index f4a04fe086..47b1b25fa0 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -206,20 +206,17 @@ PLUGIN_HEADER
 #   define SOL_LEFT          BUTTON_SCROLL_BACK
 #   define SOL_RIGHT         BUTTON_SCROLL_FWD
 #   define SOL_MOVE          (BUTTON_SELECT|BUTTON_REL)
-#   define SOL_DRAW          (BUTTON_SELECT|BUTTON_UP)
+#   define SOL_DRAW          (BUTTON_HOME|BUTTON_REL)
 #   define SOL_REM2CUR       BUTTON_LEFT
-/* FIXME:
-#   define SOL_CUR2STACK_PRE BUTTON_HOME
-#   define SOL_CUR2STACK     (BUTTON_HOME | BUTTON_RIGHT) */
 #   define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT)
 #   define SOL_CUR2STACK     BUTTON_RIGHT
 #   define SOL_REM2STACK     (BUTTON_LEFT|BUTTON_REPEAT)
 #   define SOL_REM2STACK_PRE BUTTON_LEFT
-#   define HK_MOVE           "SELECT"
-#   define HK_DRAW           "REC"
+#   define HK_MOVE           "SHORT SELECT"
+#   define HK_DRAW           "SHORT HOME"
 #   define HK_REM2CUR        "LEFT"
 #   define HK_CUR2STACK      "DOUBLE SELECT"
-#   define HK_REM2STACK      "RIGHT"
+#   define HK_REM2STACK      "LEFT"
 
 #elif (CONFIG_KEYPAD == SANSA_C200_PAD)
 #   define SOL_QUIT          BUTTON_POWER
@@ -1576,7 +1573,7 @@ int solitaire( int skipmenu )
 
         /* what to do when a key is pressed ... */
         button = rb->button_get( true );
-#if (CONFIG_KEYPAD == SANSA_E200_PAD)
+#if (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
         if (button&(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD))
             button = button & (~BUTTON_REPEAT);
 #endif