diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp
index a21214f13..f950d5c61 100644
--- a/es-app/src/views/GamelistView.cpp
+++ b/es-app/src/views/GamelistView.cpp
@@ -438,9 +438,9 @@ std::vector<HelpPrompt> GamelistView::getHelpPrompts()
 
     if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() &&
         ViewController::getInstance()->getState().viewing == ViewController::GAMELIST)
-        prompts.push_back(HelpPrompt("a", "enter"));
+        prompts.push_back(HelpPrompt("a", "select"));
     else
-        prompts.push_back(HelpPrompt("a", "launch"));
+        prompts.push_back(HelpPrompt("a", "select"));
 
     prompts.push_back(HelpPrompt("b", "back"));
     prompts.push_back(HelpPrompt("x", "view media"));
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 7d3e8bd48..6bee0c52b 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -680,14 +680,14 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts, const HelpSt
                   static const std::vector<std::string> map = {"up/down/left/right",
                                                                "up/down",
                                                                "left/right",
-                                                               "a",
-                                                               "b",
-                                                               "x",
-                                                               "y",
-                                                               "r",
-                                                               "l",
                                                                "rt",
                                                                "lt",
+                                                               "r",
+                                                               "l",
+                                                               "y",
+                                                               "x",
+                                                               "b",
+                                                               "a",
                                                                "start",
                                                                "back"};
                   int i = 0;