diff --git a/es-app/src/SystemScreenSaver.cpp b/es-app/src/SystemScreenSaver.cpp
index e2af3a71d..1fd1a0a84 100644
--- a/es-app/src/SystemScreenSaver.cpp
+++ b/es-app/src/SystemScreenSaver.cpp
@@ -2,7 +2,7 @@
 //  SystemScreenSaver.cpp
 //
 //  Screensaver, supporting the following modes:
-//  Dim, black, video, slideshow.
+//  Dim, black, slideshow, video.
 //
 
 #include "SystemScreenSaver.h"
diff --git a/es-app/src/SystemScreenSaver.h b/es-app/src/SystemScreenSaver.h
index 4390a8a22..80243e573 100644
--- a/es-app/src/SystemScreenSaver.h
+++ b/es-app/src/SystemScreenSaver.h
@@ -2,7 +2,7 @@
 //  SystemScreenSaver.h
 //
 //  Screensaver, supporting the following modes:
-//  Dim, black, video, slideshow.
+//  Dim, black, slideshow, video.
 //
 
 #pragma once
diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
index 2ccb037f3..59a582b72 100644
--- a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
@@ -54,10 +54,8 @@ GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const
                 "random video" && screensaver_behavior->getSelected() == "random video") {
             // If before it wasn't risky but now there's a risk of problems, show warning.
             mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(),
-            "THE \"RANDOM VIDEO\" SCREENSAVER SHOWS\nVIDEOS FROM YOUR GAMELISTS.\n\nIF YOU DO NOT "
-            "HAVE ANY VIDEOS, THE SCREENSAVER\nWILL DEFAULT TO \"BLACK\".\n\nSEE MORE "
-            "OPTIONS IN THE MENU \"UI SETTINGS\" >\n\"SCREENSAVER SETTINGS\" > "
-            "\"VIDEO SCREENSAVER SETTINGS\".",
+            "THE \"RANDOM VIDEO\" SCREENSAVER\nSHOWS VIDEOS FROM YOUR GAMELISTS.\n\nIF YOU DO NOT "
+            "HAVE ANY VIDEOS, THE\nSCREENSAVER WILL DEFAULT TO \"BLACK\"",
                 "OK", [] { return; }));
         }
         Settings::getInstance()->setString("ScreenSaverBehavior",
diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.cpp b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
index ef7990f2c..6263bbf22 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
@@ -17,7 +17,7 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
         : GuiScreensaverOptions(window, title)
 {
     // Timer for swapping videos.
-    auto swap = std::make_shared<SliderComponent>(mWindow, 10.f, 1000.f, 1.f, "s");
+    auto swap = std::make_shared<SliderComponent>(mWindow, 10.f, 300.f, 5.f, "s");
     swap->setValue((float)(Settings::getInstance()->
             getInt("ScreenSaverSwapVideoTimeout") / (1000)));
     addWithLabel("SWAP VIDEO AFTER (SECS)", swap);
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index ebdbd8819..0eee26c6f 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -131,18 +131,20 @@ void Window::input(InputConfig* config, Input input)
     if (mScreenSaver) {
         if (mScreenSaver->isScreenSaverActive() &&
                 Settings::getInstance()->getBool("ScreenSaverControls") &&
-                (Settings::getInstance()->getString("ScreenSaverBehavior") == "random video")) {
+                ((Settings::getInstance()->getString("ScreenSaverBehavior") == "random video") ||
+                (Settings::getInstance()->getString("ScreenSaverBehavior") == "slideshow"))) {
             if (mScreenSaver->getCurrentGame() != nullptr &&
-                    (config->isMappedLike("right", input) ||
-                    config->isMappedTo("start", input) || config->isMappedTo("select", input))) {
-                if (config->isMappedLike("right", input) || config->isMappedTo("select", input)) {
+                    (config->isMappedTo("a", input) ||
+                    config->isMappedLike("left", input) || config->isMappedLike("right", input))) {
+                // Left or right browses to the next video or image.
+                if (config->isMappedLike("left", input) || config->isMappedLike("right", input)) {
                     if (input.value != 0) {
                         // Handle screensaver control.
                         mScreenSaver->nextVideo();
                     }
                     return;
                 }
-                else if (config->isMappedTo("start", input) && input.value != 0) {
+                else if (config->isMappedTo("a", input) && input.value != 0) {
                     // Launch game.
                     cancelScreenSaver();
                     mScreenSaver->launchGame();