diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index ea8decac9..eac30a4f5 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -1659,6 +1659,9 @@ void ViewController::rescanROMDirectory()
         // It's possible that there are no longer any games.
         mWindow->setBlockInput(false);
         mWindow->invalidateCachedBackground();
+        mWindow->passHelpComponents(nullptr);
+        mWindow->passClockComponents(nullptr);
+        mWindow->passSystemStatusComponents(nullptr);
         noGamesDialog();
     }
     else {