diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp
index 85bc2b103..8a21bd6cb 100644
--- a/es-app/src/guis/GuiScraperMulti.cpp
+++ b/es-app/src/guis/GuiScraperMulti.cpp
@@ -167,18 +167,19 @@ void GuiScraperMulti::finish()
         ss << "NO GAMES WERE SCRAPED";
     }
     else {
-        ss << mTotalSuccessful << " GAME" << ((mTotalSuccessful > 1) ? "S" : "") <<
-                " SUCCESSFULLY SCRAPED";
+        ss << mTotalSuccessful << " GAME" <<
+                ((mTotalSuccessful > 1) ? "S" : "") << " SUCCESSFULLY SCRAPED";
 
         if (mTotalSkipped > 0)
-            ss << "\n" << mTotalSkipped << " GAME" << ((mTotalSkipped > 1) ? "S" : "") <<
-                    " SKIPPED";
+            ss << "\n" << mTotalSkipped << " GAME"
+                    << ((mTotalSkipped > 1) ? "S" : "") << " SKIPPED";
     }
 
     mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(), ss.str(), "OK", [&] {
-        delete this; }));
+        mIsProcessing = false;
+        delete this;
+    }));
 
-    mIsProcessing = false;
     PowerSaver::resume();
 }
 
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 484fbf10e..1565627c6 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -274,7 +274,7 @@ void Window::render()
     if (mTimeSinceLastInput >= screensaverTime && screensaverTime != 0) {
         if (mGameLaunchedState)
             mTimeSinceLastInput = 0;
-        else
+        else if (!isProcessing() && !mScreenSaver->isScreenSaverActive())
             startScreenSaver();
     }