diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp
index 6f8632b1d..e31f19369 100644
--- a/es-app/src/guis/GuiThemeDownloader.cpp
+++ b/es-app/src/guis/GuiThemeDownloader.cpp
@@ -1119,6 +1119,14 @@ bool GuiThemeDownloader::input(InputConfig* config, Input input)
                 ++mFullscreenViewerIndex;
             return true;
         }
+        else if (config->isMappedLike("lefttrigger", input)) {
+            mFullscreenViewerIndex = 0;
+            return true;
+        }
+        else if (config->isMappedLike("righttrigger", input)) {
+            mFullscreenViewerIndex = mViewerScreenshots.size() - 1;
+            return true;
+        }
         else {
             mViewerScreenshots.clear();
             mViewerCaptions.clear();