diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 3834e8695..d4211bf9b 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -308,7 +308,12 @@ void Window::render()
             bottom->stopAllAnimations();
         }
 
-        bottom->render(transform);
+        // Don't render the system view or gamelist view if the video or slideshow screensaver
+        // is running.
+        if (!(mRenderScreensaver && (Settings::getInstance()->getString("ScreensaverType") ==
+                "video" || Settings::getInstance()->getString("ScreensaverType") == "slideshow")))
+            bottom->render(transform);
+
         if (bottom != top) {
             #if defined(USE_OPENGL_21)
             if (!mCachedBackground) {