diff --git a/es-app/src/views/gamelist/BasicGameListView.cpp b/es-app/src/views/gamelist/BasicGameListView.cpp
index d852ea61f..17cba1f5f 100644
--- a/es-app/src/views/gamelist/BasicGameListView.cpp
+++ b/es-app/src/views/gamelist/BasicGameListView.cpp
@@ -312,6 +312,15 @@ std::vector<HelpPrompt> BasicGameListView::getHelpPrompts()
     prompts.push_back(HelpPrompt("up/down", "choose"));
     prompts.push_back(HelpPrompt("a", "launch"));
     prompts.push_back(HelpPrompt("b", "back"));
+
+    if (mRoot->getSystem()->isGameSystem() &&
+            mRoot->getSystem()->getThemeFolder() != "custom-collections")
+        prompts.push_back(HelpPrompt("x", "view media"));
+
+    if (mRoot->getSystem()->isGameSystem() && !mCursorStack.empty() &&
+            mRoot->getSystem()->getThemeFolder() == "custom-collections")
+        prompts.push_back(HelpPrompt("x", "view media"));
+
     if (!UIModeController::getInstance()->isUIModeKid())
         prompts.push_back(HelpPrompt("select", "options"));
     if (mRoot->getSystem()->isGameSystem() && Settings::getInstance()->getBool("RandomAddButton"))
diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index b8f357db0..b50eabc2a 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -707,6 +707,15 @@ std::vector<HelpPrompt> GridGameListView::getHelpPrompts()
     prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
     prompts.push_back(HelpPrompt("a", "launch"));
     prompts.push_back(HelpPrompt("b", "back"));
+
+    if (mRoot->getSystem()->isGameSystem() &&
+            mRoot->getSystem()->getThemeFolder() != "custom-collections")
+        prompts.push_back(HelpPrompt("x", "view media"));
+
+    if (mRoot->getSystem()->isGameSystem() && !mCursorStack.empty() &&
+            mRoot->getSystem()->getThemeFolder() == "custom-collections")
+        prompts.push_back(HelpPrompt("x", "view media"));
+
     if (!UIModeController::getInstance()->isUIModeKid())
         prompts.push_back(HelpPrompt("select", "options"));
     if (mRoot->getSystem()->isGameSystem() &&
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.cpp b/es-app/src/views/gamelist/ISimpleGameListView.cpp
index e8d5c498a..67f07e631 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGameListView.cpp
@@ -175,6 +175,17 @@ bool ISimpleGameListView::input(InputConfig* config, Input input)
 
             return true;
         }
+        else if (config->isMappedTo("x", input)) {
+            if (getCursor()->getType() == PLACEHOLDER) {
+                NavigationSounds::getInstance()->playThemeNavigationSound(SCROLLSOUND);
+                return true;
+            }
+            else if (mRoot->getSystem()->isGameSystem()) {
+                stopListScrolling();
+                mWindow->startMediaViewer(getCursor());
+                return true;
+            }
+        }
         else if (config->isMappedLike(getQuickSystemSelectRightButton(), input)) {
             if (Settings::getInstance()->getBool("QuickSystemSelect") &&
                     SystemData::sSystemVector.size() > 1) {