diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 9cb67d40b..be4122515 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -894,6 +894,7 @@ void Window::renderScreensaver()
 void Window::startMediaViewer(FileData* game)
 {
     if (mMediaViewer) {
+        stopInfoPopup();
         if (mMediaViewer->startMediaViewer(game)) {
             setAllowTextScrolling(false);
             setAllowFileAnimation(false);