diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/controls.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/controls.conf
index 027e7ca..cee1c56 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/controls.conf
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/controls.conf
@@ -6,12 +6,12 @@ pageUp = PageDown
 pageDown = PageUp
 letterUp = N
 letterDown = M
-favPlaylist = F3
-nextPlaylist = F2
-prevPlaylist = F1
-addPlaylist = I
-removePlaylist = O
-random = G
+favPlaylist = S
+nextPlaylist = O
+prevPlaylist = V
+addPlaylist = Y
+removePlaylist = X
+random = K
 select = Return, A
 menu = Q
 back = B
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/settings.conf
index 2ee9e53..e1674c2 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/settings.conf
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/settings.conf
@@ -30,7 +30,7 @@ showSquareBrackets = no
 firstCollection = Main
 
 # specify whether RetroFE should switch to Favorites list if it exists.
-autoFavorites = false
+autoFavorites = true
 
 # specify whether RetroFE should remember the last selected game
 rememberMenu = true