diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index c5cf8a63c..9b272e339 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -290,11 +290,14 @@ void ViewController::goToGameList(SystemData* system)
         cancelViewTransitions();
 
     // Disable rendering of the system view.
-    if (getSystemListView()->getRenderView())
+    if (getSystemListView()->getRenderView()) {
         getSystemListView()->setRenderView(false);
+    }
     // If switching between gamelists, disable rendering of the current view.
-    else if (mCurrentView)
+    else if (mCurrentView) {
+        mCurrentView->onHide();
         mCurrentView->setRenderView(false);
+    }
 
     if (mState.viewing == SYSTEM_SELECT) {
         // Move system list.