diff --git a/es-app/src/MediaViewer.cpp b/es-app/src/MediaViewer.cpp
index e7d9c93dc..4481e697e 100644
--- a/es-app/src/MediaViewer.cpp
+++ b/es-app/src/MediaViewer.cpp
@@ -52,6 +52,8 @@ bool MediaViewer::startMediaViewer(FileData* game)
     if (!mHasVideo && !mHasImages)
         return false;
 
+    Window::getInstance()->stopInfoPopup();
+
     HelpStyle style;
     style.font = Font::get(FONT_SIZE_MINI);
     style.origin = {0.5f, 0.5f};
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 98c25afea..d83336937 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -894,7 +894,6 @@ void Window::renderScreensaver()
 void Window::startMediaViewer(FileData* game)
 {
     if (mMediaViewer) {
-        stopInfoPopup();
         if (mMediaViewer->startMediaViewer(game)) {
             setAllowTextScrolling(false);
             setAllowFileAnimation(false);