diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index d6a55df72..789077a63 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -1434,7 +1434,8 @@ void SystemView::renderElements(const glm::mat4& parentTrans, bool abovePrimary)
     // If it's a gamelist to system transition and these animations are set to slide.
     if (static_cast<ViewTransitionAnimation>(Settings::getInstance()->getInt(
             "TransitionsGamelistToSystem")) == ViewTransitionAnimation::SLIDE &&
-        viewState.previouslyViewed == ViewController::ViewMode::GAMELIST)
+        viewState.previouslyViewed == ViewController::ViewMode::GAMELIST &&
+        ViewController::getInstance()->isCameraMoving())
         stationaryApplicable = true;
 
     for (int i {renderBefore}; i <= renderAfter; ++i) {
diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index 9a7f069c4..24208fb15 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -140,8 +140,8 @@ void ViewController::setMenuColors()
 void ViewController::legacyAppDataDialog()
 {
     const std::string upgradeMessage {
-        "AS OF ES-DE 3.0.0 THE APPLICATION DATA DIRECTORY HAS CHANGED FROM \".emulationstation\" to "
-        "\"ES-DE\"\nPLEASE RENAME YOUR CURRENT DATA DIRECTORY:\n" +
+        "AS OF ES-DE 3.0.0 THE APPLICATION DATA DIRECTORY HAS CHANGED FROM \".emulationstation\" "
+        "to \"ES-DE\"\nPLEASE RENAME YOUR CURRENT DATA DIRECTORY:\n" +
         Utils::FileSystem::getAppDataDirectory().string() + "\nTO THE FOLLOWING:\n" +
         Utils::FileSystem::getAppDataDirectory().parent_path().append("ES-DE").string()};