diff --git a/es-app/src/views/gamelist/BasicGameListView.cpp b/es-app/src/views/gamelist/BasicGameListView.cpp
index 4e479f317..a4d0d9d34 100644
--- a/es-app/src/views/gamelist/BasicGameListView.cpp
+++ b/es-app/src/views/gamelist/BasicGameListView.cpp
@@ -97,6 +97,16 @@ void BasicGameListView::addPlaceholder()
 	mList.add(placeholder->getName(), placeholder, (placeholder->getType() == PLACEHOLDER));
 }
 
+std::string BasicGameListView::getQuickSystemSelectRightButton()
+{
+	return "right";
+}
+
+std::string BasicGameListView::getQuickSystemSelectLeftButton()
+{
+	return "left";
+}
+
 void BasicGameListView::launch(FileData* game)
 {
 	ViewController::get()->launch(game);
diff --git a/es-app/src/views/gamelist/BasicGameListView.h b/es-app/src/views/gamelist/BasicGameListView.h
index fe16b9636..f1a216b0f 100644
--- a/es-app/src/views/gamelist/BasicGameListView.h
+++ b/es-app/src/views/gamelist/BasicGameListView.h
@@ -24,6 +24,8 @@ public:
 	virtual void launch(FileData* game) override;
 
 protected:
+	virtual std::string getQuickSystemSelectRightButton() override;
+	virtual std::string getQuickSystemSelectLeftButton() override;
 	virtual void populateList(const std::vector<FileData*>& files) override;
 	virtual void remove(FileData* game, bool deleteFile) override;
 	virtual void addPlaceholder();
diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index b7fa1d032..6226158f3 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -1,6 +1,7 @@
 #include "views/gamelist/GridGameListView.h"
 
 #include "views/ViewController.h"
+#include "Settings.h"
 #include "SystemData.h"
 
 GridGameListView::GridGameListView(Window* window, FileData* root) : ISimpleGameListView(window, root),
@@ -27,6 +28,16 @@ void GridGameListView::setCursor(FileData* file)
 	}
 }
 
+std::string GridGameListView::getQuickSystemSelectRightButton()
+{
+	return "pagedown"; //rightshoulder
+}
+
+std::string GridGameListView::getQuickSystemSelectLeftButton()
+{
+	return "pageup"; //leftshoulder
+}
+
 bool GridGameListView::input(InputConfig* config, Input input)
 {
 	if(config->isMappedTo("left", input) || config->isMappedTo("right", input))
@@ -88,6 +99,12 @@ void GridGameListView::remove(FileData *game, bool deleteFile)
 std::vector<HelpPrompt> GridGameListView::getHelpPrompts()
 {
 	std::vector<HelpPrompt> prompts;
+
+	if(Settings::getInstance()->getBool("QuickSystemSelect"))
+	{
+		prompts.push_back(HelpPrompt("l", "system"));
+		prompts.push_back(HelpPrompt("r", "system"));
+	}
 	prompts.push_back(HelpPrompt("up/down/left/right", "scroll"));
 	prompts.push_back(HelpPrompt("a", "launch"));
 	prompts.push_back(HelpPrompt("b", "back"));
diff --git a/es-app/src/views/gamelist/GridGameListView.h b/es-app/src/views/gamelist/GridGameListView.h
index a6ded9028..0fb7fc145 100644
--- a/es-app/src/views/gamelist/GridGameListView.h
+++ b/es-app/src/views/gamelist/GridGameListView.h
@@ -23,6 +23,8 @@ public:
 	virtual void launch(FileData* game) override;
 
 protected:
+	virtual std::string getQuickSystemSelectRightButton() override;
+	virtual std::string getQuickSystemSelectLeftButton() override;
 	virtual void populateList(const std::vector<FileData*>& files) override;
 	virtual void remove(FileData* game, bool deleteFile) override;
 	virtual void addPlaceholder();
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.cpp b/es-app/src/views/gamelist/ISimpleGameListView.cpp
index 860eda0ba..fb123f1f5 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGameListView.cpp
@@ -118,7 +118,7 @@ bool ISimpleGameListView::input(InputConfig* config, Input input)
 			}
 
 			return true;
-		}else if(config->isMappedTo("right", input))
+		}else if(config->isMappedTo(getQuickSystemSelectRightButton(), input))
 		{
 			if(Settings::getInstance()->getBool("QuickSystemSelect"))
 			{
@@ -126,7 +126,7 @@ bool ISimpleGameListView::input(InputConfig* config, Input input)
 				ViewController::get()->goToNextGameList();
 				return true;
 			}
-		}else if(config->isMappedTo("left", input))
+		}else if(config->isMappedTo(getQuickSystemSelectLeftButton(), input))
 		{
 			if(Settings::getInstance()->getBool("QuickSystemSelect"))
 			{
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.h b/es-app/src/views/gamelist/ISimpleGameListView.h
index f2d83b748..f161eadd0 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.h
+++ b/es-app/src/views/gamelist/ISimpleGameListView.h
@@ -28,6 +28,8 @@ public:
 	virtual void launch(FileData* game) = 0;
 
 protected:
+	virtual std::string getQuickSystemSelectRightButton() = 0;
+	virtual std::string getQuickSystemSelectLeftButton() = 0;
 	virtual void populateList(const std::vector<FileData*>& files) = 0;
 
 	TextComponent mHeaderText;